基因定制增加科研同步配置

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowInfoServiceImpl.java

@@ -310,26 +310,35 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
         String nickname = userIdNameCache.getNicknameByUserId(vo.getProjectLeader());
         projectFeignDTO.setLeaders(nickname);
 
-        log.info("推送科研项目：flowId={}, param={}", id, JSON.toJSONString(projectFeignDTO));
-        R<Long> longR = remoteProjectService.initProject(projectFeignDTO);
-        if (!longR.isOk()) {
-            log.error("projectId={}推送科研失败，{}", id, longR);
+        Long kyId = null;
+        if (systemPropertiesService.getBooleanValue("gene.sync.ky")) {
+            log.info("推送科研项目：flowId={}, param={}", id, JSON.toJSONString(projectFeignDTO));
+            R<Long> longR = remoteProjectService.initProject(projectFeignDTO);
+            if (!longR.isOk()) {
+                log.error("projectId={}推送科研失败，{}", id, longR);
+            }
+            Assert.isTrue(longR.isOk(), "操作失败，科研" + longR);
+            kyId = longR.getData();
+            new FlowInfo().setId(id).setKyId(kyId).updateById();
+        } else {
+            log.warn("基因定制-科研同步配置未开启，不进行同步");
+        }
+
+        if (kyId != null && systemPropertiesService.getBooleanValue("sample.sync.animal")) {
+            //同步动物中心，生成动物中心项目信息
+            LacmsProjectDTO lacmsProjectDTO = new LacmsProjectDTO();
+            lacmsProjectDTO.setKyId(kyId);
+            lacmsProjectDTO.setProjectName(flowInfo.getProjectName());
+            lacmsProjectDTO.setProjectLeader(vo.getProjectLeader());
+            lacmsProjectDTO.setPl(flowInfo.getProjectLeaderName());
+            lacmsProjectDTO.setEthicsCode(flowInfo.getApprovalNo());
+            lacmsProjectDTO.setProjectType("基因定制");
+            lacmsProjectDTO.setProjectNum(flowInfo.getApprovalNo());
+            log.info("推送动物中心：flowId={}, param={}", id, JSON.toJSONString(lacmsProjectDTO));
+            subProjectFeign.initProject(lacmsProjectDTO);
+        } else {
+            log.warn("基因定制-科研同步配置未开启，不进行同步");
         }
-        Assert.isTrue(longR.isOk(), "操作失败，科研" + longR);
-        Long kyId = longR.getData();
-        new FlowInfo().setId(id).setKyId(kyId).updateById();
-
-        //同步动物中心，生成动物中心项目信息
-        LacmsProjectDTO lacmsProjectDTO = new LacmsProjectDTO();
-        lacmsProjectDTO.setKyId(kyId);
-        lacmsProjectDTO.setProjectName(flowInfo.getProjectName());
-        lacmsProjectDTO.setProjectLeader(vo.getProjectLeader());
-        lacmsProjectDTO.setPl(flowInfo.getProjectLeaderName());
-        lacmsProjectDTO.setEthicsCode(flowInfo.getApprovalNo());
-        lacmsProjectDTO.setProjectType("基因定制");
-        lacmsProjectDTO.setProjectNum(flowInfo.getApprovalNo());
-        log.info("推送动物中心：flowId={}, param={}", id, JSON.toJSONString(lacmsProjectDTO));
-        subProjectFeign.initProject(lacmsProjectDTO);
 
         //通知相关人
         String userIds = systemPropertiesService.getValue("gene.execute.id");

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleInfoServiceImpl.java

@@ -361,7 +361,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
             kyId = longR.getData();
             new FlowInfo().setId(id).setKyId(kyId).updateById();
         } else {
-            log.warn("科研同步配置未开启，不进行同步");
+            log.warn("样本送检-科研同步配置未开启，不进行同步");
             return;
         }
 
@@ -378,7 +378,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
             log.info("推送动物中心：flowId={}, param={}", id, JSON.toJSONString(lacmsProjectDTO));
             subProjectFeign.initProject(lacmsProjectDTO);
         } else {
-            log.warn("动物中心同步配置未开启，不进行同步");
+            log.warn("样本送检-动物中心同步配置未开启，不进行同步");
         }
     }