归档导出添加转移字段

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/domain/ZsReportArchieve.java

@@ -68,4 +68,8 @@ public class ZsReportArchieve extends BaseEntity {
      * 转移位置
      */
     private String transferLocation;
+    /**
+     * 转移位置
+     */
+    private String transferTime;
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/mapper/xml/ZsReportArchieveMapper.xml

@@ -34,7 +34,8 @@
             a.storage_place,
             a.status,
             a.special_place,
-            a.transfer_location
+            a.transfer_location,
+            date_format(a.transfer_time, '%Y-%m-%d %H:%i:%s') as transferTime
     </sql>
     <select id="findList" resultType="com.jeeplus.centrecareful.reportArchieve.domain.ZsReportArchieve">
         select
@@ -185,11 +186,13 @@
 
     <update id="updatePlaceByYear">
         UPDATE zs_report_archieve a
-            SET
-                a.transfer_location = #{transferLocation},
-                a.transfer_time = NOW()
-        WHERE a.report_no LIKE CONCAT('%(', #{reportNo}, ')%')
+        SET
+            a.transfer_location = #{transferLocation},
+            a.transfer_time = NOW()
+        WHERE
+            (a.report_no LIKE CONCAT('%(', #{reportNo}, ')%')
+                OR a.report_no LIKE CONCAT('%[', #{reportNo}, ']%'))
           AND a.status = '1'
-        AND a.del_flag = '0';
+          AND a.del_flag = '0';
     </update>
 </mapper>

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/service/dto/ZsReportArchieveExport.java

@@ -88,6 +88,12 @@ public class ZsReportArchieveExport extends BaseEntity {
     @Excel(name = "存放地点(区位码)",width = 20)
     private String storagePlace;    //存放地点(区位码)
 
+    @Excel(name = "转移位置",width = 15)
+    private String transferLocation; //转移位置
+
+    @Excel(name = "转移时间",width = 20)
+    private String transferTime;    //转移时间
+
     private String archieveNo;  //流水号
     private String status;  //状态
     private String specialPlace;    //存放区域（特殊）

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -116,7 +116,8 @@
         cw_pa.report_remarks,
         cw_pa.audit_money,
         cw_pa.connect_report_id,
-        cw_pa.borrow_type
+        cw_pa.borrow_type,
+        date_format(cw_pa.transfer_time, '%Y-%m-%d %H:%i:%s') as transferTime
     </sql>
     <sql id="Archive_File_Column_List">
         cw_paf.id,
@@ -291,6 +292,8 @@
         cw_pa.approved_no_including_tax as approvedNoIncludingTax,
         cw_pa.approved_including_tax as approvedIncludingTax,
         cw_pa.entrust_type as entrustType,
+        cw_pa.special_place as specialPlace,
+        date_format(cw_pa.transfer_time, '%Y-%m-%d %H:%i:%s') as transferTime,
         sureview.name as secondAuditName,
 
         cw_pr.project_name as project_name,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/dto/CwProjectReportArchiveDTO.java

@@ -94,9 +94,18 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 文档存放位置
      */
+    @Excel(name = "文件存放位置",width = 25,orderNum = "17")
     private String specialPlace;
 
     /**
+     * 文档存放位置
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "转移时间",width = 25,orderNum = "18" , format = "yyyy-MM-dd HH:mm:ss")
+    private Date transferTime;
+
+    /**
      * 审核备注
      */
     private String approveRemarks;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/dto/CwProjectReportArchiveExportDTO.java

@@ -184,7 +184,7 @@ public class CwProjectReportArchiveExportDTO extends BaseDTO {
     /**
      * 备注信息
      */
-    @Excel(name = "备注",width = 25,orderNum = "17")
+    @Excel(name = "备注",width = 25,orderNum = "19")
     private String remarks;
 
 
@@ -384,6 +384,20 @@ public class CwProjectReportArchiveExportDTO extends BaseDTO {
      */
     private String userName;
 
+    /**
+     * 文档存放位置
+     */
+    @Excel(name = "文档存放位置",width = 25,orderNum = "17")
+    private String specialPlace;
+
+    /**
+     * 文档存放位置
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "转移时间",width = 25,orderNum = "18" , format = "yyyy-MM-dd HH:mm:ss")
+    private Date transferTime;
+
 
     private static final long serialVersionUID = 1L;