|
@@ -279,6 +279,9 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
|
|
|
}
|
|
|
|
|
|
Assert.isTrue(StrConstant.YES.equals(vo.getAuditResult()), "审核结果错误");
|
|
|
+ if (GeneStatusEnum.PROJECT_MANAGEMENT.getStatus().equals(flowInfo.getStatus())) {
|
|
|
+ Assert.isTrue(StrUtil.isNotBlank(vo.getApprovalNo()), "项目批准编号必填");
|
|
|
+ }
|
|
|
|
|
|
//审核通过
|
|
|
log.info("流程项目 ({}) 审核通过", flowInfo.getProjectName());
|
|
@@ -307,6 +310,7 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
|
|
|
projectFeignDTO.setName(flowInfo.getProjectName());
|
|
|
projectFeignDTO.setLeader(vo.getProjectLeader());
|
|
|
projectFeignDTO.setProjectType(vo.getApprovalType());
|
|
|
+ projectFeignDTO.setProjectCode(flowInfo.getApprovalNo());
|
|
|
|
|
|
//推送申请人nickname
|
|
|
String nickname = userIdNameCache.getNicknameByUserId(vo.getProjectLeader());
|
|
@@ -329,9 +333,7 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
|
|
|
lacmsProjectDTO.setPl(flowInfo.getProjectLeaderName());
|
|
|
lacmsProjectDTO.setEthicsCode(flowInfo.getApprovalNo());
|
|
|
lacmsProjectDTO.setProjectType("基因定制");
|
|
|
- JSONObject jsonObject = new JSONObject();
|
|
|
- jsonObject.put("projectNoPrefix", "Gene");
|
|
|
- lacmsProjectDTO.setExt(jsonObject);
|
|
|
+ lacmsProjectDTO.setProjectNum(flowInfo.getApprovalNo());
|
|
|
log.info("推送动物中心:flowId={}, param={}", id, JSON.toJSONString(lacmsProjectDTO));
|
|
|
subProjectFeign.initProject(lacmsProjectDTO);
|
|
|
|