归档调整

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/controller/ZsReportArchieveController.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -322,4 +323,22 @@ public class ZsReportArchieveController {
 
     }
 
+
+    /**
+     * 根据报告年份修改文档存放位置
+     * @param reportArchieve
+     * @return
+     */
+    @ApiOperation(value = "根据报告年份修改文档存放位置")
+    @PostMapping(value = "/updatePlaceByYear")
+    public ResponseEntity<String> updatePlaceByYear(@RequestBody  ZsReportArchieve reportArchieve) {
+        int rows = reportArchieveService.updatePlaceByYear(reportArchieve);
+        if (rows > 0) {
+            return ResponseEntity.ok("操作成功，共转移 " + rows + " 条份报告");
+        } else {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .body("未找到对应年份的数据");
+        }
+    }
+
 }

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

@@ -36,4 +36,10 @@ public interface ZsReportArchieveMapper extends BaseMapper<ZsReportArchieve> {
      * @param batchList
      */
     void insertBatch(@Param("batchList") List<ZsReportArchieve> batchList);
+
+    /**
+     * 修改归档信息
+     * @param zsReportArchieve
+     */
+    Integer updatePlaceByYear(ZsReportArchieve zsReportArchieve);
 }

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

@@ -181,4 +181,13 @@
             #{item.specialPlace})
         </foreach>
     </insert>
+
+    <update id="updatePlaceByYear">
+        UPDATE zs_report_archieve a
+            SET
+                a.special_place = #{specialPlace},
+                a.transfer_time = NOW()
+        WHERE a.report_no LIKE CONCAT('%(', #{reportNo}, ')%')
+          AND a.status = '1';
+    </update>
 </mapper>

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

@@ -550,5 +550,14 @@ public class ZsReportArchieveService {
         return "操作成功";
     }
 
+    /**
+     * 根据报告年份修改文档存放位置
+     * @param zsReportArchieve
+     * @return
+     */
+    public int updatePlaceByYear(ZsReportArchieve zsReportArchieve) {
+        int result = reportArchieveMapper.updatePlaceByYear(zsReportArchieve);
+        return result;
+    }
 
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/domain/CwProjectReportArchive.java

@@ -56,7 +56,7 @@ public class CwProjectReportArchive extends BaseEntity {
     /**
      * 案卷号
      */
-    @Query(tableColumn = "cw_pa.number",type = QueryType.LIKE)
+    //@Query(tableColumn = "cw_pa.number",type = QueryType.LIKE)
     private String number;
 
     /**

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

@@ -164,6 +164,14 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 if (ArrayUtil.isNotEmpty(cwProjectReportArchiveDTO.getAuditDates())){
                     queryWrapper.between("cw_pa.audit_date", cwProjectReportArchiveDTO.getAuditDates()[0], cwProjectReportArchiveDTO.getAuditDates()[1]);
                 }
+                //如果案卷号存在，同时添加模糊查询文档位置
+                if(StringUtils.isNotBlank(cwProjectReportArchiveDTO.getNumber())){
+                    queryWrapper.and(qw ->
+                            qw.like("cw_pa.number", cwProjectReportArchiveDTO.getNumber())
+                                    .or()
+                                    .like("cw_pa.special_place", cwProjectReportArchiveDTO.getNumber())
+                    );
+                }
                 // 创建人
                 if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO.getCreateBy())){
                     if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCreateBy().getName())){
@@ -533,6 +541,14 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
         try {
             QueryWrapper<CwProjectReportArchive> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwProjectReportArchiveWrapper.INSTANCE.toEntity(cwProjectReportArchiveDTO), CwProjectReportArchive.class );
             queryWrapper.eq("cw_pa.del_flag","0");
+            //如果案卷号存在，同时添加模糊查询文档位置
+            if(StringUtils.isNotBlank(cwProjectReportArchiveDTO.getNumber())){
+                queryWrapper.and(qw ->
+                        qw.like("cw_pa.number", cwProjectReportArchiveDTO.getNumber())
+                                .or()
+                                .like("cw_pa.special_place", cwProjectReportArchiveDTO.getNumber())
+                );
+            }
 
             List<CwProjectReportArchiveDTO> list = cwProjectReportArchiveMapper.getNotFiledYetList(queryWrapper);
             //循环查询出来的数据
@@ -614,6 +630,14 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                     queryWrapper.ge("cw_pa.audit_date", cwProjectReportArchiveDTO.getAuditDates()[0])
                             .le("cw_pa.audit_date", cwProjectReportArchiveDTO.getAuditDates()[1]);
                 }
+                //如果案卷号存在，同时添加模糊查询文档位置
+                if(StringUtils.isNotBlank(cwProjectReportArchiveDTO.getNumber())){
+                    queryWrapper.and(qw ->
+                            qw.like("cw_pa.number", cwProjectReportArchiveDTO.getNumber())
+                                    .or()
+                                    .like("cw_pa.special_place", cwProjectReportArchiveDTO.getNumber())
+                    );
+                }
                 // 创建人
                 if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO.getCreateBy())){
                     if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCreateBy().getName())){
@@ -729,6 +753,14 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 if (ArrayUtil.isNotEmpty(cwProjectReportArchiveDTO.getAuditDates())){
                     queryWrapper.between("cw_pa.audit_date", cwProjectReportArchiveDTO.getAuditDates()[0], cwProjectReportArchiveDTO.getAuditDates()[1]);
                 }
+                //如果案卷号存在，同时添加模糊查询文档位置
+                if(StringUtils.isNotBlank(cwProjectReportArchiveDTO.getNumber())){
+                    queryWrapper.and(qw ->
+                            qw.like("cw_pa.number", cwProjectReportArchiveDTO.getNumber())
+                                    .or()
+                                    .like("cw_pa.special_place", cwProjectReportArchiveDTO.getNumber())
+                    );
+                }
                 // 创建人
                 if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO.getCreateBy())){
                     if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCreateBy().getName())){