20221022

项目登记列表导出修改和归档添加字段

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/domain/ProgramArchive.java

@@ -160,5 +160,20 @@ public class ProgramArchive extends BaseEntity {
      */
     private String auditDate;
 
+    /**
+     * 审核通过审批人id
+     */
+    private String auditUserId;
+
+    /**
+     * 签字评估师1
+     */
+    private String signatureEvaluatorFirst;
+
+    /**
+     * 签字评估师2
+     */
+    private String signatureEvaluatorSecond;
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/xml/ProgramArchiveMapper.xml

@@ -41,6 +41,9 @@
             <result property="processDefinitionId" column="process_definition_id" jdbcType="VARCHAR"/>
             <result property="status" column="status" jdbcType="VARCHAR"/>
             <result property="reportNo" column="report_no" jdbcType="VARCHAR"/>
+            <result property="auditUserId" column="audit_user_id" jdbcType="VARCHAR"/>
+            <result property="signatureEvaluatorFirst" column="signature_evaluator_first" jdbcType="VARCHAR"/>
+            <result property="signatureEvaluatorSecond" column="signature_evaluator_second" jdbcType="VARCHAR"/>
             <association property="programProjectListInfo" select="getProgram" javaType="com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo" column="program_id"></association>
     </resultMap>
 
@@ -80,7 +83,10 @@
         pa.process_definition_id,
         pa.status,
         pa.audit_date,
-        pa.audit_date as "auditDateDate"
+        pa.audit_date as "auditDateDate",
+        pa.audit_user_id,
+        pa.signature_evaluator_first,
+        pa.signature_evaluator_second
     </sql>
     <sql id="Program_Column_List">
         id,create_by,create_date,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -259,11 +259,11 @@
                 b.forensics,
                 b.report_charges,
                 b.current_dispose_person,
-                b.is_invoice,
-                b.invoice_date,
-                b.is_contract_archive,
-                b.is_papers_intact,
-                b.is_papers_archive
+                (CASE b.is_invoice WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_invoice,
+                DATE_FORMAT(b.invoice_date,"%y-%m-%d") AS invoice_date,
+                (CASE b.is_contract_archive WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_contract_archive,
+                (CASE b.is_papers_intact WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_papers_intact,
+                (CASE b.is_papers_archive WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_papers_archive
             FROM
                 program_project_list_info a
                 LEFT JOIN program_archive b ON a.id = b.program_id

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/dto/ProgramArchiveDto.java

@@ -210,5 +210,20 @@ public class ProgramArchiveDto extends BaseDTO {
      */
     private Date auditDateDate;
 
+    /**
+     * 审核通过审批人id
+     */
+    private String auditUserId;
+
+    /**
+     * 签字评估师1
+     */
+    private String signatureEvaluatorFirst;
+
+    /**
+     * 签字评估师2
+     */
+    private String signatureEvaluatorSecond;
+
     private static final long serialVersionUID = 1L;
 }