日志重签和档案项目级同步

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/ContractLogClient.java

@@ -38,7 +38,7 @@ public interface ContractLogClient {
     JSONObject queryContractLogByPrimaryKeyIdAndRecordTime(@RequestParam String nodePrimaryKeyId, @RequestParam String recordTime, @RequestParam String contractId);
 
     @GetMapping(API_PREFIX + "/queryContractLogByPrimaryKeyIdAndRecordTimeList")
-    List<ContractLog> queryContractLogByPrimaryKeyIdAndRecordTimeList(@RequestParam String nodePrimaryKeyId, @RequestParam String recordTime, @RequestParam String contractId);
+    List<ContractLog> queryContractLogByPrimaryKeyIdAndRecordTimeList(@RequestParam String nodePrimaryKeyId, @RequestParam String recordTime, @RequestParam String contractId,@RequestParam Long createUser);
 
     @GetMapping(API_PREFIX + "/queryContractLogByPrimaryKeyIdAndRecordTimeAndCreateUserList")
     List<ContractLog> queryContractLogByPrimaryKeyIdAndRecordTimeAndCreateUserList(@RequestParam String nodePrimaryKeyId, @RequestParam String recordTime, @RequestParam String contractId, @RequestParam Long createUser);

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ArchiveTree.java

@@ -240,5 +240,6 @@ public class ArchiveTree extends BaseEntity {
         this.archiveAutoGroupId = archiveTree.getArchiveAutoGroupId();
         this.archiveAutoGroupSelect = archiveTree.getArchiveAutoGroupSelect();
         this.isUploadFileDisplayConfigurationTree = archiveTree.getIsDisplayTree();
+        this.storageTime=archiveTree.getStorageTime();
     }
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/ExcelTabClient.java

@@ -87,4 +87,7 @@ public interface ExcelTabClient {
 
     @PostMapping(API_PREFIX + "/saveLinkTab")
     void saveLinkTab(@RequestParam Long excelId,@RequestParam Long pKeyId) throws IOException;
+
+    @PostMapping(API_PREFIX + "/getTheLogPdInfo")
+    void getTheLogPdInfo(@RequestParam String logPkeyId,  @RequestParam String nodePrimaryKeyId, @RequestParam String recordTime, @RequestParam String contractId,@RequestParam Long createUser) throws Exception;
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/ExcelTabClientFallBack.java

@@ -96,5 +96,10 @@ public class ExcelTabClientFallBack implements ExcelTabClient {
 
     }
 
+    @Override
+    public void getTheLogPdInfo(String logPkeyId, String nodePrimaryKeyId, String recordTime, String contractId,Long createUser) throws Exception {
+
+    }
+
 
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ArchiveTreeVO2.java

@@ -182,6 +182,9 @@ public class ArchiveTreeVO2 implements INodeEx<ArchiveTreeVO2> {
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
+    @ApiModelProperty(value = "保管期限")
+    private String storageTime;
+
     private String expDataType;
 
     /**
@@ -220,6 +223,7 @@ public class ArchiveTreeVO2 implements INodeEx<ArchiveTreeVO2> {
                 Objects.equals(this.archiveAutoNodeId, b.getArchiveAutoNodeId()) &&
                 Objects.equals(this.archiveAutoGroupId, b.getArchiveAutoGroupId()) &&
                 Objects.equals(this.archiveAutoGroupSelect, b.getArchiveAutoGroupSelect()) &&
+                Objects.equals(this.storageTime, b.getStorageTime()) &&
                 this.isDisplayTree == b.getIsDisplayTree();
     }
 
@@ -245,6 +249,7 @@ public class ArchiveTreeVO2 implements INodeEx<ArchiveTreeVO2> {
         this.archiveAutoGroupSelect = archiveTree.getArchiveAutoGroupSelect();
         this.isUploadFileDisplayConfigurationTree = archiveTree.getIsDisplayTree();
         this.isDisplayTree = archiveTree.getIsDisplayTree();
+        this.storageTime=archiveTree.getStorageTime();
         this.flag = 1;
     }
 

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ContractLogClientImpl.java

@@ -105,12 +105,12 @@ public class ContractLogClientImpl implements ContractLogClient {
     }
 
     @Override
-    public List<ContractLog> queryContractLogByPrimaryKeyIdAndRecordTimeList(String nodePrimaryKeyId, String recordTime, String contractId) {
+    public List<ContractLog> queryContractLogByPrimaryKeyIdAndRecordTimeList(String nodePrimaryKeyId, String recordTime, String contractId,Long createUser) {
         return this.contractLogService.getBaseMapper().selectList(Wrappers.<ContractLog>lambdaQuery()
                 .eq(ContractLog::getWbsNodeId, nodePrimaryKeyId)
                 .eq(ContractLog::getRecordTime, recordTime)
                 .eq(ContractLog::getContractId, contractId)
-                .eq(ContractLog::getCreateUser, AuthUtil.getUserId()));
+                .eq(ContractLog::getCreateUser, createUser==null?AuthUtil.getUserId():createUser));
     }
 
     @Override

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -1992,7 +1992,8 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                 contractLogService.update(new LambdaUpdateWrapper<ContractLog>().eq(ContractLog::getId, contractLog.getId())
                     .set(ContractLog::getEVisaPdfUrl, null)
                     .set(ContractLog::getPdfUrl, null));
-                excelTabClient.getTheContractLogBusinessData(dto.getLogPkeyId(), dto.getNodePrimaryKeyId(), contractLog.getRecordTime(), dto.getContractId(), contractLog.getCreateUser());
+                //excelTabClient.getTheContractLogBusinessData(dto.getLogPkeyId(), dto.getNodePrimaryKeyId(), contractLog.getRecordTime(), dto.getContractId(), contractLog.getCreateUser());
+                excelTabClient.getTheLogPdInfo(dto.getLogPkeyId(), dto.getNodePrimaryKeyId(), contractLog.getRecordTime(), dto.getContractId(),contractLog.getCreateUser());
             }
         }
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -2359,13 +2359,13 @@ public class ExcelTabController extends BladeController {
             @ApiImplicitParam(name = "String pkeyId", value = "当前表pKeyId"),
             @ApiImplicitParam(name = "recordTime", value = "当前选择的填写日期，即右侧日期控件所选日期，格式为 yyyy-MM-dd")
     })
-    public R<String> getTheLogPdInfo(String pkeyId, String nodePrimaryKeyId, String recordTime, String contractId) throws Exception {
+    public R<String> getTheLogPdInfo(String pkeyId, String nodePrimaryKeyId, String recordTime, String contractId,Long createUser) throws Exception {
         //获取配置的路径
         String file_path = FileUtils.getSysLocalFileUrl();
         if (StringUtils.isEmpty(recordTime)) {
             recordTime = DateUtil.format(DateUtil.now(), "yyyy-MM-dd");
         }
-        List<ContractLog> contractLogList = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(nodePrimaryKeyId, recordTime, contractId);
+        List<ContractLog> contractLogList = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(nodePrimaryKeyId, recordTime, contractId,createUser);
         List<String> ids = contractLogList.stream().map(ContractLog::getId).map(String::valueOf).collect(Collectors.toList());
         if (ids.size() > 0) {
             //PDF路径
@@ -2672,7 +2672,7 @@ public class ExcelTabController extends BladeController {
             }
             dataIds = ids.stream().filter(Objects::nonNull).collect(Collectors.joining(","));
         } else {
-            List<ContractLog> contractLogs = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(nodePrimaryKeyId, recordTime, contractId);
+            List<ContractLog> contractLogs = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(nodePrimaryKeyId, recordTime, contractId,null);
             if (contractLogs.size() == 0) {
                 logId2 = "";
             } else {
@@ -2821,7 +2821,6 @@ public class ExcelTabController extends BladeController {
                         e.printStackTrace();
                     }
                     for (Map<String, Object> mysqlData : businessDataMap) {
-
                         String querySqlx = "SELECT tree_primary_key_id as primaryKeyId,title as path from u_contract_log_wbs where  business_id ='" + dataId + "' and is_deleted = 0";
                         List<Map<String, Object>> businessDat = this.jdbcTemplate.queryForList(querySqlx);
                         reData.put("linkTabIds", businessDat);
@@ -2865,7 +2864,8 @@ public class ExcelTabController extends BladeController {
                                             reData.put(key + "__" + tabData[1], strings);
                                         } else {
                                             if (tabVal.contains("[") && tabVal.contains("]")) {
-                                                reData.put(key + "__" + tabData[1], tabData[0]);
+                                                String[] strings = new String[]{tabData[0]};
+                                                reData.put(key + "__" + tabData[1],strings);
                                             } else {
                                                 reData.put(key + "__" + tabData[1], tabData[0]);
                                             }
@@ -3110,7 +3110,7 @@ public class ExcelTabController extends BladeController {
                     return fail("没有数据可复制");
                 } else {
                     //查询当前所在日期日志记录
-                    List<ContractLog> contractLogs = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(nodePrimaryKeyId, currentTime, contractId);
+                    List<ContractLog> contractLogs = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(nodePrimaryKeyId, currentTime, contractId,null);
                     if (ObjectUtil.isEmpty(contractLogs)) {
                         String id = this.contractLogClient.saveContractLog(new SaveContractLogVO(
                                 dataIds,
@@ -3483,7 +3483,7 @@ public class ExcelTabController extends BladeController {
             //保存日志
             data = this.excelTabService.saveOrUpdateTheLog(tableInfoList);
         }
-        this.getTheLogPdInfo(pkeyId, nodePrimaryKeyId, recordTime, contractId);
+        this.getTheLogPdInfo(pkeyId, nodePrimaryKeyId, recordTime, contractId,null);
         return R.data(data);
     }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/ExcelTabClientImpl.java

@@ -511,6 +511,11 @@ public class ExcelTabClientImpl implements ExcelTabClient {
         excelTabController.saveLinkeTab(excelId,pKeyId);
     }
 
+    @Override
+    public void getTheLogPdInfo(String logPkeyId, String nodePrimaryKeyId, String recordTime, String contractId,Long createUser) throws Exception {
+        excelTabController.getTheLogPdInfo(logPkeyId, nodePrimaryKeyId, recordTime, contractId,createUser);
+    }
+
 
     private String getHtmlString(String pkeyId) throws Exception {
         WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.selectOne(Wrappers.<WbsTreePrivate>query().lambda()
@@ -542,7 +547,7 @@ public class ExcelTabClientImpl implements ExcelTabClient {
             }
             dataIds = ids.stream().filter(Objects::nonNull).collect(Collectors.joining(","));
         } else {
-            List<ContractLog> contractLogs = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(nodePrimaryKeyId, recordTime, contractId);
+            List<ContractLog> contractLogs = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(nodePrimaryKeyId, recordTime, contractId,null);
             if (contractLogs.size() == 0){
                 logId2="";
             }else {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -665,7 +665,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         String ids = "";
         if (StringUtils.isEmpty(businessIds)) {
             //检查是否存在原本的数据
-            List<ContractLog> contractLogs = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(parentNode.getPKeyId().toString(), recordTime, tableInfoList.get(0).getContractId());
+            List<ContractLog> contractLogs = this.contractLogClient.queryContractLogByPrimaryKeyIdAndRecordTimeList(parentNode.getPKeyId().toString(), recordTime, tableInfoList.get(0).getContractId(),null);
             if (contractLogs.size() > 0) {
                 businessIds = contractLogs.stream().map(ContractLog::getDataId).filter(ObjectUtils::isNotEmpty).map(String::valueOf).collect(Collectors.joining(","));
                 ids = contractLogs.stream().map(ContractLog::getId).map(String::valueOf).collect(Collectors.joining(","));

blade-service/blade-repair/src/main/java/org/springblade/repair/controller/CheckAndRepairController.java

@@ -359,7 +359,7 @@ public class CheckAndRepairController {
      * 检查private html文件是否存在
      */
     @GetMapping("/checkPrivateHtmlIsExist")
-    @Scheduled(cron = "0  30  1 * * ?")
+    @Scheduled(cron = "0  0  12 * * ?")
     public void checkPrivateHtmlIsExist() throws Exception {
         String sql="select p_key_id, excel_id,html_url from m_wbs_tree_private where html_url IS NOT NULL  and is_deleted=0";
         List<WbsTreePrivate> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(WbsTreePrivate.class));
@@ -376,8 +376,9 @@ public class CheckAndRepairController {
             boolean flag=true;
             //判断文件是否存在
             if(!html.exists()){
+                System.out.println("文件不存在："+htmlUrl+"："+wbsTreePrivate.getPKeyId());
                 List<WbsTreePrivate> list1;
-                Path sourcePath = Paths.get(htmlUrl);
+                Path targetPath = Paths.get(htmlUrl);
                 String sql1="select html_url from m_wbs_tree_private where excel_id="+wbsTreePrivate.getExcelId()+" and is_deleted=0"+" and init_table_name= '"+wbsTreePrivate.getInitTableName()+"' and html_url like '%"+result+"' ";
                 list1= jdbcTemplate.query(sql1, new BeanPropertyRowMapper<>(WbsTreePrivate.class));
                 if(list1.isEmpty()){
@@ -389,7 +390,7 @@ public class CheckAndRepairController {
                 for (String htmlUrlSet : htmlSets) {
                     File htmlSet = new File(htmlUrlSet);
                     if(htmlSet.exists()){
-                        Path targetPath = Paths.get(htmlUrlSet);
+                        Path sourcePath = Paths.get(htmlUrlSet);
                         Files.copy(sourcePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
                         System.out.println("文件复制成功！"+wbsTreePrivate.getPKeyId());
                         flag=false;
@@ -408,5 +409,4 @@ public class CheckAndRepairController {
         }
         System.out.println("检查完毕,更新了"+i+"条记录");
     }
-
 }