fix(87798): 首页-高级检索-条款 导出文件表头字段需修改

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java

@@ -69,7 +69,7 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity {
     @ApiModelProperty(value = "涉及系统/部件）")
     @Excel(name = "涉及系统/部件", width = 15)
     @Dict(dictTable = "laws_part_name", dicCode = "code", dicText = "name")
-    private String keywords;
+    private String partName;
     /**涉及系统/部件）*/
     @ApiModelProperty(value = "关键控制器）")
     @Excel(name = "关键控制器", width = 15, dicCode = "key_controller")

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java

@@ -475,8 +475,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                                     standardInterpretClauseSublist.getChangeDescription()));
                             first.setRegulatoryNotes(mergeString(first.getRegulatoryNotes(),
                                     standardInterpretClauseSublist.getRegulatoryNotes()));
-                            first.setKeywords(mergeString(first.getKeywords(),
+                            first.setPartName(mergeString(first.getPartName(),
-                                    standardInterpretClauseSublist.getKeywords()));
+                                    standardInterpretClauseSublist.getPartName()));
                             first.setKeyController(mergeString(first.getKeyController(),
                                     standardInterpretClauseSublist.getKeyController()));
                             first.setResponsibleDepartment(mergeString(first.getResponsibleDepartment(),
@@ -548,7 +548,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
     }
 
     private void distinct(ProcessStandardInterpretClauseSublist data) {
-        data.setKeywords(toDistinct(data.getKeywords()));
+        data.setPartName(toDistinct(data.getPartName()));
         data.setKeyController(toDistinct(data.getKeyController()));
         data.setIsSameAsPrevVersion(toDistinct(data.getIsSameAsPrevVersion()));
         data.setResponsibleDepartment(toDistinct(data.getResponsibleDepartment()));
@@ -1061,7 +1061,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
 
     private List<String> secondVerify(ProcessStandardInterpretClauseSublist data) {
         List<String> errorList = new ArrayList<>();
-        String keywords = data.getKeywords();
+        String keywords = data.getPartName();
         if (StringUtils.isNotBlank(keywords)){
             boolean flag = true;
             List<String> list = new ArrayList<>();
@@ -1074,11 +1074,11 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                     flag = false;
                     break;
                 }else {
-                    data.setKeywords(optionalPartName.get().getCode());
+                    data.setPartName(optionalPartName.get().getCode());
                 }
             }
             if (flag){
-                data.setKeywords(String.join(",", list));
+                data.setPartName(String.join(",", list));
             }
         }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/FlowImportExcel.java

@@ -48,7 +48,7 @@ public class FlowImportExcel {
     /**涉及系统/部件）*/
     @ApiModelProperty(value = "涉及系统/部件）")
     @Excel(name = "涉及系统/部件", width = 15)
-    private String keywords;
+    private String partName;
     /**涉及系统/部件）*/
     @ApiModelProperty(value = "关键控制器）")
     @Excel(name = "关键控制器", width = 15)

laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchClauseExcelVO.java

@@ -1,6 +1,5 @@
 package com.jero.modules.laws.home.vo;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -30,10 +29,10 @@ public class LawsHomeAdvancedSearchClauseExcelVO implements Serializable {
     private String itemNum;
 
     /**
-     * 标准标题
+     * 条款标题
      */
-    @ApiModelProperty(value = "标准标题")
+    @ApiModelProperty(value = "条款标题")
-    @Excel(name = "标准标题", width = 15)
+    @Excel(name = "条款标题", width = 15)
     private String itemTitle;
 
     /**
@@ -47,7 +46,6 @@ public class LawsHomeAdvancedSearchClauseExcelVO implements Serializable {
      * 适用零部件
      */
     @ApiModelProperty(value = "适用零部件")
-    @Excel(name = "适用零部件", width = 30)
     private String applicableComponents;
 
 
@@ -78,8 +76,7 @@ public class LawsHomeAdvancedSearchClauseExcelVO implements Serializable {
      */
     @ApiModelProperty(value = "涉及系统/部件")
     @Excel(name = "涉及系统/部件", width = 30)
-    @JsonProperty("keywords")
+    private String partNameDictText;
-    private String keywords;
 
     /**
      * 责任部门
@@ -88,6 +85,13 @@ public class LawsHomeAdvancedSearchClauseExcelVO implements Serializable {
     @Excel(name = "责任部门", width = 30)
     private String responsibleDepartmentDictText;
 
+    /**
+     * 责任部门专业模块
+     */
+    @ApiModelProperty("责任部门专业模块")
+    @Excel(name = "责任部门专业模块", width = 30)
+    private String responsibleModuleDictText;
+
     /**
      * 关联部门
      */
@@ -95,6 +99,13 @@ public class LawsHomeAdvancedSearchClauseExcelVO implements Serializable {
     @Excel(name = "关联部门", width = 30)
     private String relatedDepartmentDictText;
 
+    /**
+     * 关联部门专业模块
+     */
+    @ApiModelProperty("关联部门专业模块")
+    @Excel(name = "关联部门专业模块", width = 30)
+    private String relatedModuleDictText;
+
     /**
      * 适用车型
      */