From a48f7a607fe4b3fcf9410a1f523ddc45fb7e43d3 Mon Sep 17 00:00:00 2001
From: lijiarao <136157943@qq.com>
Date: Sat, 3 Feb 2024 15:32:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081422=20=E4=B8=93=E9=A1=B9=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93-=E6=B5=81=E7=A8=8B=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=98=AF=E5=8F=AF=E4=BB=A5=E7=82=B9=E5=87=BB=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectStandardService.java               | 1 +
 .../projectLibrary/entity/LawsSpecialProjectLibrary.java     | 5 +++++
 .../mapper/xml/LawsSpecialProjectLibraryMapper.xml           | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index addff2c9..4b9d0a03 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -710,6 +710,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
             projectLibrary.setMaterial(term.getFileId());
             projectLibrary.setValuationTime(date);
             projectLibrary.setProjectApproval(term.getProjectApprovalFlag());
+            projectLibrary.setProcessInstanceId(process.getProcessInstanceId());
             projectLibrary.setProcessNum(process.getPrcNum());
             projectLibrary.setProcessTermId(termId);
             //存入不符合描述
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java
index f3036c50..03b8404d 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java
@@ -125,6 +125,11 @@ public class LawsSpecialProjectLibrary implements Serializable {
 	@Excel(name = "项目名称", width = 15)
     @ApiModelProperty(value = "项目名称")
     private String projectName;
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value="流程实例id")
+    private String processInstanceId;
 	/**流程编号*/
 	@Excel(name = "流程编号", width = 15)
     @ApiModelProperty(value = "流程编号")
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsSpecialProjectLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsSpecialProjectLibraryMapper.xml
index 6322b650..fee3a3d3 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsSpecialProjectLibraryMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsSpecialProjectLibraryMapper.xml
@@ -27,6 +27,7 @@
         <result column="process_num" property="processNum" />
         <result column="model_series" property="modelSeries"/>
         <result column="process_term_id" property="processTermId"/>
+        <result column="process_instance_id" property="processInstanceId"/>
     </resultMap>
 
     <select id="pageList" resultMap="LawsSpecialProjectLibraryResultMap">
@@ -57,6 +58,7 @@
                lspl.project_approval,
                lspl.work_number,
                lspl.project_name,
+               lspl.process_instance_id,
                lspl.process_num,
                lspl.process_term_id
         from laws_special_project_library lspl