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;