From 8145257072b5466346c8f8f7e7ca7fd1af203a0b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 9 Jan 2024 16:50:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080342=20=E3=80=90=E9=98=BB=E5=A1=9E?=
 =?UTF-8?q?=E3=80=91=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9-=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=20=E6=B2=A1=E6=9C=89=E6=AD=A3=E5=B8=B8=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=AF=84=E4=BC=B0=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E4=B9=9F=E4=B8=8D=E8=83=BD=E7=82=B9=E5=87=BB=EF=BC=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/controller/ActivitiController.java       |  8 ++++++++
 .../service/ProcessProjectNotMetService.java          | 11 +++++++++--
 .../projectLibrary/entity/LawsEvaluationNotMet.java   |  4 ++++
 3 files changed, 21 insertions(+), 2 deletions(-)

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<List<ProcessNode>> 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<ProcessProjectNotMe
                 break;
             //法规工程师审批
             case ProcessProjectNotMetCommon.FGGCSSP:
-                fggcsspApprove(processInfoVO, processDTO, pass);
+                fggcsspApprove(processInfoVO, processDTO, pass, processAll);
                 break;
             default:
         }
@@ -217,7 +217,7 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         }
     }
 
-    private void fggcsspApprove(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
+    private void fggcsspApprove(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, ProcessDTO processDTO, boolean pass, ProcessAll processAll) {
         // 完成任务
         Map<String, Object> variables = new HashMap<>();
         if (!pass){
@@ -239,6 +239,13 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         wrapper.set(LawsEvaluationNotMet::getState, pass ? DONE : RECTIFICATION);
         wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList);
         lawsEvaluationNotMetService.update(wrapper);
+        //如果通过，更新未符合项列表的流程编号
+        if (pass){
+            LambdaUpdateWrapper<LawsEvaluationNotMet> wrapper1 = new LambdaUpdateWrapper<>();
+            wrapper1.set(LawsEvaluationNotMet::getPrcNum, processAll.getPrcNum());
+            wrapper1.in(LawsEvaluationNotMet::getId,projectNotMetIdList);
+            lawsEvaluationNotMetService.update(wrapper1);
+        }
     }
 
     public void submit(ProcessInfoVO<ProcessProjectNotMetVO> 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)