|
@@ -6,11 +6,15 @@ import org.springblade.business.entity.InformationQuery;
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
import org.springblade.manager.entity.ArchiveTreeContract;
|
|
import org.springblade.manager.entity.ArchiveTreeContract;
|
|
import org.springblade.manager.entity.ContractInfo;
|
|
import org.springblade.manager.entity.ContractInfo;
|
|
|
|
+import org.springblade.manager.entity.ProjectInfo;
|
|
import org.springblade.manager.mapper.ArchiveTreeContractMapper;
|
|
import org.springblade.manager.mapper.ArchiveTreeContractMapper;
|
|
|
|
+import org.springblade.manager.service.IContractInfoService;
|
|
import org.springblade.manager.service.IProjectInfoService;
|
|
import org.springblade.manager.service.IProjectInfoService;
|
|
import org.springblade.common.utils.ForestNodeMergerEx;
|
|
import org.springblade.common.utils.ForestNodeMergerEx;
|
|
|
|
+import org.springblade.manager.utils.ForestNodeMerger;
|
|
import org.springblade.manager.vo.ArchiveTreeContractVO2;
|
|
import org.springblade.manager.vo.ArchiveTreeContractVO2;
|
|
import org.springblade.manager.vo.ArchiveTreeVO2;
|
|
import org.springblade.manager.vo.ArchiveTreeVO2;
|
|
|
|
+import org.springblade.manager.vo.WbsTreeContractVO6;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
@@ -27,6 +31,8 @@ public class ArchiveTreeContractSyncImpl {
|
|
|
|
|
|
private final ArchiveAutoRuleSyncImpl archiveAutoRuleSync;
|
|
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
|
|
//获取某个合同段所有的电签完成的文件题名,取 id wbsid name,eVisaPdfUrl
|
|
List<InformationQuery> informationQueryList = getInformationQuerys(contractId);
|
|
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
|
|
//对于newInformationQueryList。生成,需提供对应的nodeid
|
|
|
|
|
|
//对于updateInformationQueryList,需要找出更新文件和文件大小
|
|
//对于updateInformationQueryList,需要找出更新文件和文件大小
|