From 8bce6339a903098dfdcdf3e1b9c9fffd06a2f69b Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 19 May 2022 16:45:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=20=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E3=80=81=E9=AA=8C=E8=AF=81=E3=80=81prehomo=20=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E8=BF=99=E6=9D=A1=E6=B3=95=E8=A7=84=E7=9A=84?= =?UTF-8?q?=20=E5=BD=93=E5=89=8D=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLibraryBaseServiceImpl.java | 8 ++++--- .../wkflow/controller/workFlowController.java | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 1c6dd825a..9b4c4eb08 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -279,9 +279,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl 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){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index ca5dd0233..d31446cf7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -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 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); + } + }