diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java index 3f1d596f..0a121a17 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java @@ -56,6 +56,8 @@ public class ActivitiController { @Resource private RepositoryService repositoryService; @Resource + private RuntimeService runtimeService; + @Resource private TaskService taskService; @Resource private ProcessNodeService processNodeService; @@ -270,6 +272,12 @@ public class ActivitiController { }) @ApiOperation("获得节点列表") public Result> getNodeList(String processDefinitionKey,String processDefinitionId,String processInstanceId) { + if (StringUtils.isNotBlank(processInstanceId)){ + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() + .processInstanceId(processInstanceId) + .singleResult(); + processDefinitionId = processInstance.getProcessDefinitionId(); + } if (StringUtils.isBlank(processDefinitionId)){ processDefinitionId = repositoryService.createProcessDefinitionQuery() // 创建部署信息查询器 .processDefinitionKey(processDefinitionKey) // 根据流程部署key查询 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java index e9c0361f..eb290a93 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java @@ -183,7 +183,7 @@ public class ProcessProjectNotMetService extends ServiceImpl processInfoVO, ProcessDTO processDTO, boolean pass) { + private void fggcsspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass, ProcessAll processAll) { // 完成任务 Map variables = new HashMap<>(); if (!pass){ @@ -239,6 +239,13 @@ public class ProcessProjectNotMetService extends ServiceImpl wrapper1 = new LambdaUpdateWrapper<>(); + wrapper1.set(LawsEvaluationNotMet::getPrcNum, processAll.getPrcNum()); + wrapper1.in(LawsEvaluationNotMet::getId,projectNotMetIdList); + lawsEvaluationNotMetService.update(wrapper1); + } } public void submit(ProcessInfoVO processInfoVO) { diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java index 16ff7051..90e35284 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java @@ -132,6 +132,10 @@ public class LawsEvaluationNotMet implements Serializable { @ApiModelProperty(value = "所属部门") private String orgCode; + /**所属流程*/ + @Dict(dictTable = "process_all", dicText = "process_instance_id", dicCode = "prc_num") + @ApiModelProperty(value = "所属流程") + private String prcNum; /**预计整改完成日期范围*/ @TableField(exist = false)