From 3dfd9c8bf3cb623d8933577a47dcffa6e2456e7a Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 31 Jul 2024 10:11:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(87798):=20=E9=A6=96=E9=A1=B5-=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2-=E6=9D=A1=E6=AC=BE=20=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E8=A1=A8=E5=A4=B4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=9C=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ProcessStandardInterpretClauseSublist.java | 2 +- .../StandardInterpretFlowServiceImpl.java | 12 ++++----- .../standardinterpret/vo/FlowImportExcel.java | 2 +- .../LawsHomeAdvancedSearchClauseExcelVO.java | 25 +++++++++++++------ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java index e68e54f2..1d6eac8a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java +++ b/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") 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 c8cf83e4..4c16b37c 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 @@ -475,8 +475,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe standardInterpretClauseSublist.getChangeDescription())); first.setRegulatoryNotes(mergeString(first.getRegulatoryNotes(), standardInterpretClauseSublist.getRegulatoryNotes())); - first.setKeywords(mergeString(first.getKeywords(), - standardInterpretClauseSublist.getKeywords())); + first.setPartName(mergeString(first.getPartName(), + 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 secondVerify(ProcessStandardInterpretClauseSublist data) { List errorList = new ArrayList<>(); - String keywords = data.getKeywords(); + String keywords = data.getPartName(); if (StringUtils.isNotBlank(keywords)){ boolean flag = true; List 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)); } } 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 6373bde5..b5dab8f5 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 @@ -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) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchClauseExcelVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchClauseExcelVO.java index 19b82a3d..3aa5a650 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchClauseExcelVO.java +++ b/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 = "标准标题") - @Excel(name = "标准标题", width = 15) + @ApiModelProperty(value = "条款标题") + @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 keywords; + private String partNameDictText; /** * 责任部门 @@ -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; + /** * 适用车型 */