WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

启动 设计、验证、prehomo 初始化这条法规的 当前项目状态

Browse Source
This commit is contained in:
wangzhijiang
2022-05-19 16:45:02 +08:00
parent 96496e961f
commit 8bce6339a9
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+5 -3
View File
@@ -279,9 +279,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
for (CertificationProgressEnum certificationProgressEnumValue : CertificationProgressEnumValues) {
boolean flag = true;
for (Map<String, Object> map : certificationProgressMapList) {
if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){
flag = false;
break;
if(map.get("certificationProgress") != null){
if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){
flag = false;
break;
}
}
}
if(flag){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
+24
View File
@@ -3,6 +3,10 @@ package com.jero.modules.wkflow.controller;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ConditionAssessmentEO;
import com.jero.modules.project.enums.CurrentProjectStatusEnum;
import com.jero.modules.project.enums.ProjectRoleEnum;
import com.jero.modules.project.service.IConditionAssessmentEOService;
import com.jero.modules.wkflow.entity.BusMes;
import com.jero.modules.wkflow.enums.FlowTypeEnum;
import com.jero.modules.wkflow.feginClient.impl.WorkFlowFeignClientImpl;
@@ -29,6 +33,9 @@ public class workFlowController {
@Autowired
private WorkFlowFeignClientImpl workFlowFeignClient;
@Autowired
private IConditionAssessmentEOService conditionAssessmentEOService;
public Result activiti_define_start(@RequestBody JSONObject jsonObject){
return workFlowFeignClient.activiti_define_start(jsonObject);
}
@@ -46,12 +53,15 @@ public class workFlowController {
return this.activiti_define_start(jsonObject);
}else if(StringUtils.equals(type,FlowTypeEnum.SJFHXSHLC.getValue())){
jsonObject.put("id", FlowTypeEnum.SJFHXSHLC.getProcessDefinitionKey());
initConditionAssessmentEO(jsonObject);
return this.activiti_define_start(jsonObject);
}else if(StringUtils.equals(type,FlowTypeEnum.PREHOMOQRLC.getValue())){
jsonObject.put("id", FlowTypeEnum.PREHOMOQRLC.getProcessDefinitionKey());
initConditionAssessmentEO(jsonObject);
return this.activiti_define_start(jsonObject);
}else if(StringUtils.equals(type,FlowTypeEnum.YZFHXSCLC.getValue())){
jsonObject.put("id", FlowTypeEnum.YZFHXSCLC.getProcessDefinitionKey());
initConditionAssessmentEO(jsonObject);
return this.activiti_define_start(jsonObject);
}else{
return null;
@@ -147,4 +157,18 @@ public class workFlowController {
return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu);
}
/**
* 初始化这条法规的 当前项目状态
*/
public void initConditionAssessmentEO(JSONObject jsonObject){
Object msg = jsonObject.get("msg");
Map<String,Object> projectLawsInventoryMap = com.alibaba.fastjson.JSONObject.parseObject(com.alibaba.fastjson.JSONObject.toJSONString(msg), Map.class);
ConditionAssessmentEO conditionAssessmentEO = new ConditionAssessmentEO();
conditionAssessmentEO.setRoleCode(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue());
conditionAssessmentEO.setProjectLawsInventoryId(projectLawsInventoryMap.get("id").toString());
conditionAssessmentEO.setConditionAssessment(CurrentProjectStatusEnum.BLUE.getValue());
conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO);
}
}