From e40abe750481d0a484b014624d3fd6a981644668 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 12 Aug 2024 13:43:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(87608):=20=E8=A7=A3=E8=AF=BB=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=BB=93=E6=9D=9F=EF=BC=8C=E5=85=B3=E9=94=AE=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=99=A8=E5=92=8C=E5=A4=87=E6=B3=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StandardInterpretFlowServiceImpl.java       | 1 +
 .../process/standardinterpret/vo/FlowImportExcel.java        | 2 +-
 .../modules/laws/documenttool/entity/LawsDocumentSplit.java  | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
index 2bf26bbf..2267e205 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
@@ -261,6 +261,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                 LawsDocumentSplit lawsDocumentSplit = new LawsDocumentSplit();
                 // 属性拷贝
                 BeanUtils.copyProperties(standardInterpretClauseSublist, lawsDocumentSplit);
+                lawsDocumentSplit.setRemarkss(standardInterpretClauseSublist.getRemarks());
                 lawsDocumentSplit.setItemNum(null);
                 lawsDocumentSplit.setItemTitle(null);
                 lawsDocumentSplit.setItemContent(null);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/FlowImportExcel.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/FlowImportExcel.java
index cd636cfd..b8760bfc 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/FlowImportExcel.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/FlowImportExcel.java
@@ -49,7 +49,7 @@ public class FlowImportExcel {
     @ApiModelProperty(value = "涉及系统/部件）")
     @Excel(name = "涉及系统/部件", width = 15)
     private String partName;
-    /**涉及系统/部件）*/
+    /**关键控制器*/
     @ApiModelProperty(value = "关键控制器）")
     @Excel(name = "关键控制器", width = 15)
     private String keyController;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java
index 72755c01..0e70730f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java
@@ -1,8 +1,8 @@
 package com.jero.modules.laws.documenttool.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.*;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -48,6 +48,9 @@ public class LawsDocumentSplit extends BaseEntity {
     // 涉及系统/部件
     @ApiModelProperty("涉及系统/部件")
     private String partName;
+    /**涉及系统/部件）*/
+    @ApiModelProperty(value = "关键控制器）")
+    private String keyController;
     // 适用零部件
     @ApiModelProperty("适用零部件")
     private String applicableComponents;