归档转移调整

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

@@ -64,4 +64,8 @@ public class ZsReportArchieve extends BaseEntity {
     private String updateName;
     @TableField(exist = false)
     private List<String> storagePlaces;
+    /**
+     * 转移位置
+     */
+    private String transferLocation;
 }

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

@@ -33,7 +33,8 @@
             a.archieve_resever,
             a.storage_place,
             a.status,
-            a.special_place
+            a.special_place,
+            a.transfer_location
     </sql>
     <select id="findList" resultType="com.jeeplus.centrecareful.reportArchieve.domain.ZsReportArchieve">
         select
@@ -185,9 +186,10 @@
     <update id="updatePlaceByYear">
         UPDATE zs_report_archieve a
             SET
-                a.special_place = #{specialPlace},
+                a.transfer_location = #{transferLocation},
                 a.transfer_time = NOW()
         WHERE a.report_no LIKE CONCAT('%(', #{reportNo}, ')%')
-          AND a.status = '1';
+          AND a.status = '1'
+        AND a.del_flag = '0';
     </update>
 </mapper>

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

@@ -744,6 +744,7 @@
                 a.special_place = #{specialPlace},
                 a.transfer_time = NOW()
         WHERE b.report_no LIKE CONCAT('%[', #{year}, ']%')
-        AND a.status = '5';
+        AND a.status = '5'
+        AND a.del_flag = '0';
     </update>
 </mapper>