浏览代码

电签原生信息到归档

huangtf 2 年之前
父节点
当前提交
7428930da0

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

@@ -11,6 +11,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
+import org.springblade.archive.entity.ArchiveProjectConfig;
+import org.springblade.archive.feign.ArchiveAutoClient;
 import org.springblade.business.entity.*;
 import org.springblade.business.entity.*;
 import org.springblade.business.mapper.TaskMapper;
 import org.springblade.business.mapper.TaskMapper;
 import org.springblade.business.service.*;
 import org.springblade.business.service.*;
@@ -114,6 +116,10 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
 
     private final CommonFileClient commonFileClient;
     private final CommonFileClient commonFileClient;
 
 
+    private ArchiveTreeContractClient archiveTreeContractClient;
+
+    private final ArchiveAutoClient archiveAutoClient;
+
 
 
     @Autowired
     @Autowired
     StringRedisTemplate RedisTemplate;
     StringRedisTemplate RedisTemplate;
@@ -1036,13 +1042,20 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         }
         }
 
 
         //TODO 测试完成后打开
         //TODO 测试完成后打开
-//        InformationQuery query = this.informationQueryService.getById(formDataId);
-//        if (query != null) {
-//            try {
-//                archiveTreeContractClient.writeBusinessData(query.getWbsId(),query.getContractId(),formDataId);
-//            } catch (Exception e) {
-//            }
-//        }
+        InformationQuery query = this.informationQueryService.getById(formDataId);
+        if (query != null) {
+
+            ArchiveProjectConfig archiveProjectConfig = archiveAutoClient.getByProjectIdOrNew(query.getProjectId());
+
+            //测试阶段,必须打开项目配置才能同步wbs节点
+            if (archiveProjectConfig!= null && archiveProjectConfig.getFactorType().contains("6")) {
+                //todo 等测试OK再打开
+                try {
+                    archiveTreeContractClient.writeBusinessData(query.getWbsId(),query.getContractId(),formDataId);
+                } catch (Exception e) {
+                }
+            }
+        }
 
 
     }
     }
 
 

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

@@ -188,7 +188,7 @@ public class ArchiveTreeContractSyncImpl {
         List<ArchiveTreeContract> saveList = new ArrayList<>();
         List<ArchiveTreeContract> saveList = new ArrayList<>();
 
 
         ArchiveProjectConfig archiveProjectConfig = archiveAutoClient.getByProjectIdOrNew(projectId);
         ArchiveProjectConfig archiveProjectConfig = archiveAutoClient.getByProjectIdOrNew(projectId);
-        
+
         //测试阶段,必须打开项目配置才能同步wbs节点
         //测试阶段,必须打开项目配置才能同步wbs节点
         if (archiveProjectConfig!= null && archiveProjectConfig.getFactorType().contains("6")) {
         if (archiveProjectConfig!= null && archiveProjectConfig.getFactorType().contains("6")) {
             //todo 等测试OK再打开
             //todo 等测试OK再打开