修改签字注师

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwSignatureAnnotator.java

@@ -0,0 +1,37 @@
+package com.jeeplus.finance.projectReport.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+@TableName(value = "cw_project_report_signature_annotator")
+public class CwSignatureAnnotator extends BaseEntity {
+    /**
+     * 签字注师1
+     */
+    private String signatureAnnotator1;
+
+    /**
+     * 签字注师2
+     */
+    private String signatureAnnotator2;
+
+
+    /**
+     * 报告id
+     */
+    private String reportId;
+
+    /**
+     * 创建人
+     */
+    private String userName;
+
+
+
+
+
+
+
+}

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -786,9 +786,28 @@
 
     <select id="getReportByReportNo" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReport">
         select
-            cpr.*
+            a.id,
+        a.create_by_id as createById,
+        a.create_time,
+        a.update_by_id,
+        a.update_time,
+        a.del_flag,
+        a.remarks,
+        a.status,
+        a.document_no,
+        a.project_report_number,
+        a.project_id,
+        a.office_id,
+        a.signature_type,
+        a.signature_annotator1,
+        a.signature_annotator2,
+        a.signature_contract_id,
+        a.real_create,
+        a.proc_ins_id,
+        a.process_definition_id,
+        a.signature_annotator_status
         from
-            cw_project_report cpr
+            cw_project_report a
         left join
             cw_project_report_new_line cw_prnl on cpr.id=cw_prnl.report_id
         where

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/dto/CwProjectReportDTO.java

@@ -57,11 +57,13 @@ public class CwProjectReportDTO extends BaseDTO {
     /**
      * 签字注师1
      */
+    @Excel(name = "签字注册会计师1",width = 25)
     private String signatureAnnotator1;
 
     /**
      * 签字注师2
      */
+    @Excel(name = "签字注册会计师2",width = 25)
     private String signatureAnnotator2;
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/dto/CwProjectReportDataDTO.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReport.service.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.jeeplus.core.query.Query;
 import com.jeeplus.core.query.QueryType;
 import com.jeeplus.core.service.dto.BaseDTO;