From 986b58514778a77c3484f1ce1f62701051e9b7ba Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 12 Jan 2024 14:30:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080720=20=E6=9C=AA=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E9=A1=B9-=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectNotMetService.java        | 13 +++++++++----
 .../projectLibrary/entity/LawsEvaluationNotMet.java | 12 ++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

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 2dcd5690..ac9d3e53 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
@@ -247,10 +247,15 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         lawsEvaluationNotMetService.update(wrapper);
         //如果通过，更新未符合项列表的流程编号
         if (pass){
-            LambdaUpdateWrapper<LawsEvaluationNotMet> wrapper1 = new LambdaUpdateWrapper<>();
-            wrapper1.set(LawsEvaluationNotMet::getPrcNum, processAll.getPrcNum());
-            wrapper1.in(LawsEvaluationNotMet::getId,projectNotMetIdList);
-            lawsEvaluationNotMetService.update(wrapper1);
+            for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) {
+                LambdaUpdateWrapper<LawsEvaluationNotMet> wrapper1 = new LambdaUpdateWrapper<>();
+                wrapper1.set(LawsEvaluationNotMet::getPrcNum, processAll.getPrcNum());
+                wrapper1.set(LawsEvaluationNotMet::getFileId, processProjectNotMetLink.getFileId());
+                wrapper1.set(LawsEvaluationNotMet::getDescription, processProjectNotMetLink.getDescription());
+                wrapper1.in(LawsEvaluationNotMet::getId,processProjectNotMetLink.getProjectNotMetId());
+                lawsEvaluationNotMetService.update(wrapper1);
+            }
+
         }
     }
 
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 e1ab8503..a8c5888b 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
@@ -137,6 +137,18 @@ public class LawsEvaluationNotMet implements Serializable {
     @ApiModelProperty(value = "所属流程")
     private String prcNum;
 
+    /**
+     * 依据描述
+     */
+    @ApiModelProperty(value = "依据描述")
+    private String description;
+
+    /**
+     * 佐证材料
+     */
+    @ApiModelProperty(value = "佐证材料")
+    private String fileId;
+
     /**预计整改完成日期范围*/
     @TableField(exist = false)
     @ApiModelProperty(value = "预计整改完成日期范围")