档案-日志同步

1、调整如果节点下没有按月封装数据，就同步所有日志

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

@@ -36,4 +36,6 @@ public class ArchiveSyncLogVO {
 
     @ApiModelProperty("电签文件路径")
     private String eVisaPdfUrl;
+    @ApiModelProperty("电签文件路径")
+    private Long wbsNodeId;
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.java

@@ -127,7 +127,8 @@ public interface WbsTreePrivateMapper extends EasyBaseMapper<WbsTreePrivate> {
 
     void batchUpdateIsAddConceal(@Param("private") WbsTreePrivate wbsTreePrivate,@Param("pId") Long pId);
 
-    List<ArchiveSyncLogVO> getContractAllLog(@Param("contractId") Long contractId);
+    List<ArchiveSyncLogVO> getContractAllLog(@Param("contractId") Long contractId,
+                                             @Param("wbsNodeId") Long wbsNodeId);
 
     int cancelLinkNodeTreeInfoByJL(@Param("pkeyId")String pkeyId);
 
@@ -152,4 +153,6 @@ public interface WbsTreePrivateMapper extends EasyBaseMapper<WbsTreePrivate> {
     void updateSortBatchByPKeyId(List<WbsTreePrivate> resourceData);
 
     List<ArchiveSyncLogVO> getContractAllLogMonthPack(@Param("contractId") Long contractId);
+
+    List<Long> getContractAllLogWbsNodeIds(@Param("contractId") Long contractId);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -978,6 +978,9 @@
             contract_id = #{contractId}
           AND ucl.is_deleted = 0
           AND pdf_url IS NOT NULL
+          <if test="wbsNodeId != null">
+              AND wbs_node_id = #{wbsNodeId}
+          </if>
         ORDER BY
             record_time
     </select>
@@ -1040,6 +1043,7 @@
             pdf_url e_visa_pdf_url,
             create_user,
             create_time,
+            wbs_node_id,
             ( SELECT node_type FROM m_wbs_tree_private WHERE p_key_id = ucl.wbs_node_id ) AS logType,
             ( SELECT node_name FROM m_wbs_tree_private WHERE p_key_id = ucl.wbs_node_id ) AS logName
         FROM
@@ -1050,4 +1054,8 @@
         ORDER BY
             record_time;
     </select>
+    <select id="getContractAllLogWbsNodeIds" resultType="java.lang.Long">
+        select DISTINCT wbs_node_id from u_contract_log  WHERE
+            contract_id = #{contractId}
+    </select>
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreePrivateService.java

@@ -106,11 +106,13 @@ public interface IWbsTreePrivateService extends BaseService<WbsTreePrivate> {
     //获取数据回显
     List<Long> linkNodeTreeBynodeId(String pkeyId);
 
-    List<ArchiveSyncLogVO> getContractAllLog(Long contractId);
+    List<ArchiveSyncLogVO> getContractAllLog(Long contractId, Long wbsNodeId);
 
     void diGuiWbs(int i);
 
     WbsTreePrivateVO tree3(String wbsId, String projectId);
 
     List<ArchiveSyncLogVO> getContractAllLogMonthPack(Long contractId);
+
+    List<Long> getContractAllLogWbsNodeIds(Long contractId);
 }

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

@@ -1167,10 +1167,26 @@ public class ArchiveTreeContractSyncImpl {
         List<ArchiveTreeContract> addNode = new ArrayList<>();
         List<ArchiveFile> addFile = new ArrayList<>();
         //获取合同段所有的日志，并且附带类型
+        //先查询所有当前合同段下所有日志数据的父级节点
+        List<Long> wbsNodeIds =  wbsTreePrivateService.getContractAllLogWbsNodeIds(contractId);
+        if(CollectionUtil.isEmpty(wbsNodeIds)){
+            throw new ServiceException("当前合同段下没有日志资料");
+        }
         List<ArchiveSyncLogVO> logs = wbsTreePrivateService.getContractAllLogMonthPack(contractId);
         //先查按月封装 没有再查日志
         if(CollectionUtil.isEmpty(logs)){
-            logs = wbsTreePrivateService.getContractAllLog(contractId);
+            logs = wbsTreePrivateService.getContractAllLog(contractId, null);
+        } else {
+            Map<Long, List<ArchiveSyncLogVO>> collect = logs.stream().collect(Collectors.groupingBy(ArchiveSyncLogVO::getWbsNodeId));
+            for (Long f : wbsNodeIds) {
+                List<ArchiveSyncLogVO> list = collect.get(f);
+                if(CollectionUtil.isEmpty(list)){
+                    List<ArchiveSyncLogVO> contractAllLog = wbsTreePrivateService.getContractAllLog(contractId, f);
+                    if(CollectionUtil.isNotEmpty(contractAllLog)){
+                        logs.addAll(contractAllLog);
+                    }
+                }
+            }
         }
         if (CollectionUtil.isEmpty(logs)){
             throw new ServiceException("当前合同段下没有日志资料");
@@ -1631,7 +1647,7 @@ public class ArchiveTreeContractSyncImpl {
         archiveFile.setFileName(vo.getFileName());
         archiveFile.setFileTime(vo.getRecordTime());
         archiveFile.setFileUrl(vo.getPdfUrl());
-        archiveFile.setPdfFileUrl(vo.getEVisaPdfUrl());
+        archiveFile.setPdfFileUrl(StringUtil.isNotBlank(vo.getEVisaPdfUrl()) ? vo.getEVisaPdfUrl() : vo.getPdfUrl());
         archiveFile.setFilePage(1);
         archiveFile.setIsApproval(0);
         archiveFile.setIsCertification(1);

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

@@ -3204,8 +3204,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
     }
 
     @Override
-    public List<ArchiveSyncLogVO> getContractAllLog(Long contractId) {
-        return baseMapper.getContractAllLog(contractId);
+    public List<ArchiveSyncLogVO> getContractAllLog(Long contractId, Long wbsNodeId) {
+        return baseMapper.getContractAllLog(contractId, wbsNodeId);
     }
 
     @Override
@@ -3213,6 +3213,11 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         return baseMapper.getContractAllLogMonthPack(contractId);
     }
 
+    @Override
+    public List<Long> getContractAllLogWbsNodeIds(Long contractId) {
+        return baseMapper.getContractAllLogWbsNodeIds(contractId);
+    }
+
     public void diGuiWbs(int i) {
         QueryWrapper<WbsTreePrivate> wbsTreePrivateQueryWrapper = new QueryWrapper<>();
         wbsTreePrivateQueryWrapper.select("p_key_id", "id", "p_id", "wbs_id", "project_id", "parent_id", "ancestors");