From f45eb92ce03a02cde9941956fcf6d50b629e386d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 19 Jan 2024 16:05:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=8E=E8=BD=A6=E5=9E=8B=E5=BC=BA=E5=85=B3?=
 =?UTF-8?q?=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectstandard/entity/ProcessProjectStandardTerm.java | 7 +++++++
 .../entity/ProcessProjectStandardTermUser.java             | 6 ++++++
 .../mapper/xml/ProcessProjectStandardTermMapper.xml        | 2 ++
 .../service/ProcessProjectStandardService.java             | 1 +
 4 files changed, 16 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
index ae4e7cc0..ae45161c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
@@ -158,6 +158,13 @@ public class ProcessProjectStandardTerm {
     @ApiModelProperty(value = "不涉及原因")
     private String notInvolved;
 
+    /**
+     * 是否与车型强关联
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value="是否与车型强关联")
+    private String isRelate;
+
     /**
      * 车型系列
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java
index 322f90fe..3a70f265 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java
@@ -134,6 +134,12 @@ public class ProcessProjectStandardTermUser {
     @ApiModelProperty(value="父执行实例流id")
     private String parentExecutionId;
 
+    /**
+     * 是否与车型强关联
+     */
+    @TableField(value = "is_relate")
+    @ApiModelProperty(value="是否与车型强关联")
+    private String isRelate;
     /**
      * 车型系列
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
index bce1656c..238b6940 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
@@ -29,6 +29,7 @@
     <result column="term_user_id" property="termUserId"/>
     <result column="assess_results" property="assessResults"/>
     <result column="model_series" property="modelSeries"/>
+    <result column="is_relate" property="isRelate"/>
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -88,6 +89,7 @@
     ppstu.module_owner,
     ppstu.assess_results,
     ppstu.model_series,
+    ppstu.is_relate,
     ppstu.description,
     ppstu.file_id,
     ppstu.design_engineer,
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 e014242d..fb805dc1 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
@@ -724,6 +724,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
             ProcessProjectStandardTermUser termUser = new ProcessProjectStandardTermUser();
             termUser.setId(term.getTermUserId());
             termUser.setAssessResults(term.getAssessResults());
+            termUser.setIsRelate(term.getIsRelate());
             termUser.setModelSeries(term.getModelSeries());
             termUser.setDescription(term.getDescription());
             termUser.setFileId(term.getFileId());