补充文件字段

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

@@ -985,6 +985,8 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             return;
         }
 
+        ContractInfo contractIndfo = contractClient.getContractById(contractId);
+
         ArchiveFile archiveFile = this.archiveFileService.getOne(Wrappers.<ArchiveFile>lambdaQuery()
                 .eq(ArchiveFile::getNodeId, nodeId.toString())
                 .eq(ArchiveFile::getNodeExtId, keyId)
@@ -1001,12 +1003,12 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             this.archiveFileService.updateById(archiveFile);
 
         } else {
-            archiveFile = getArchiveFile(query,nodeId,keyId,fileSize);
+            archiveFile = getArchiveFile(query,nodeId,keyId,fileSize,contractIndfo.archivesUnit());
             this.archiveFileService.save(archiveFile);
         }
     }
 
-    public ArchiveFile getArchiveFile(InformationQuery query,Long nodeId,Long keyId,Long fileSize) {
+    public ArchiveFile getArchiveFile(InformationQuery query,Long nodeId,Long keyId,Long fileSize,String unit) {
         ArchiveFile archiveFile = new ArchiveFile();
         archiveFile.setNodeId(nodeId.toString());
         archiveFile.setNodeExtId(keyId);
@@ -1014,10 +1016,16 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         archiveFile.setStatus(2); // 这里是新增归档文件，所以状态为1（已完成）
         //TODO 文件题名规则，待补充
         fillFileNameAndTime(archiveFile,query);
-        archiveFile.setFileSize(fileSize);
+
         archiveFile.setSourceType(1);
 
         //责任人怎么取
+        archiveFile.setDutyUser(unit);
+
+        //文件大小
+        archiveFile.setFileSize(query.getEVisaPdfSize());
+        archiveFile.setFilePage(query.getEVisaPdfPage());
+        archiveFile.setFileSize(fileSize);
 
         //
         archiveFile.setEVisaFile(query.getEVisaPdfUrl());

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

@@ -489,7 +489,7 @@
         <if test="contractId!=null and contractId!=''">
             and contract_id = #{contractId}
         </if>
-        ORDER BY d.sort
+        ORDER BY d.sort, title, d.create_time
     </select>
 
     <select id="trialRelationTree" resultType="org.springblade.manager.vo.TrialRecordZJTreeVO">

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

@@ -6,11 +6,15 @@ import org.springblade.business.entity.InformationQuery;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.manager.mapper.ArchiveTreeContractMapper;
+import org.springblade.manager.service.IContractInfoService;
 import org.springblade.manager.service.IProjectInfoService;
 import org.springblade.common.utils.ForestNodeMergerEx;
+import org.springblade.manager.utils.ForestNodeMerger;
 import org.springblade.manager.vo.ArchiveTreeContractVO2;
 import org.springblade.manager.vo.ArchiveTreeVO2;
+import org.springblade.manager.vo.WbsTreeContractVO6;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -27,6 +31,8 @@ public class ArchiveTreeContractSyncImpl {
 
     private final ArchiveAutoRuleSyncImpl archiveAutoRuleSync;
 
+    private final IContractInfoService contractInfoService;
+
     /**
      * 普通同步
      *
@@ -215,7 +221,7 @@ public class ArchiveTreeContractSyncImpl {
     }
 
 
-    public void  syncBusinessData(Long contractId) {
+    public void  syncBusinessData(Long projectId,Long contractId) {
         //获取某个合同段所有的电签完成的文件题名，取 id wbsid name，eVisaPdfUrl
         List<InformationQuery> informationQueryList = getInformationQuerys(contractId);
 
@@ -242,6 +248,19 @@ public class ArchiveTreeContractSyncImpl {
             }
         }
 
+        ProjectInfo projectInfo = projectInfoService.getOne(projectId);
+
+        Long lWbsId = projectInfo.getReferenceWbsTemplateId();
+
+        List<WbsTreeContractVO6> wbsTrees = contractInfoService.tree8(lWbsId.toString(), projectId.toString(), contractId.toString());
+        if (wbsTrees == null || wbsTrees.size() == 0) {
+            return ;
+        }
+
+        List<WbsTreeContractVO6> wbsTreeContractVO6s = new ArrayList<>();
+        ForestNodeMerger.getTreeList(wbsTrees.get(0), wbsTreeContractVO6s);
+
+
         //对于newInformationQueryList。生成，需提供对应的nodeid
 
         //对于updateInformationQueryList，需要找出更新文件和文件大小