From c1a6fdd0be5ee264d00569583a2b5e616d947543 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 14 Aug 2024 15:33:35 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B):=20?= =?UTF-8?q?=E8=AF=91=E6=96=87=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ocessStandardInterpretClauseSublistMapper.xml | 2 +- .../impl/StandardInterpretFlowServiceImpl.java | 2 +- .../standardinterpret/vo/FlowImportExcel.java | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml index 7d9f8fa9..221c7e62 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml @@ -9,7 +9,7 @@ standard_interpret_clause_id, clause_id, interpret_person_id, - psic2.translation + psic2.translation, is_same_as_prev_version, change_description, regulatory_notes, 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 698997a0..1d026a85 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 @@ -787,7 +787,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe excelHeadVerify(file, FlowImportExcel.class, 0, 0); List lists = ExcelImportUtil.importExcel(file.getInputStream(), FlowImportExcel.class, params); - if (CollectionUtils.isEmpty(lists) || lists.size() <= 2) { + if (CollectionUtils.isEmpty(lists)) { return Result.error(ResultCommon.IMPORT_DATA_CANNOT_BE_EMPTY); } List list = BeanCopyUtils.copyBeanList(lists, 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 b5dab8f5..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; @@ -57,10 +57,18 @@ public class FlowImportExcel { @ApiModelProperty(value = "责任部门") @Excel(name = "责任部门", width = 15) private String responsibleDepartment; + /**责任部门专业模块*/ + @ApiModelProperty(value = "责任部门专业模块") + @Excel(name = "责任部门专业模块", width = 18) + private String responsibleModule; /**关联部门*/ @ApiModelProperty(value = "关联部门") @Excel(name = "关联部门", width = 15) private String relatedDepartment; + /**关联部门专业模块*/ + @ApiModelProperty(value = "关联部门专业模块") + @Excel(name = "关联部门专业模块", width = 18) + private String relatedModule; /**适用车型*/ @ApiModelProperty(value = "适用车型") @Excel(name = "适用车型", width = 15) @@ -73,9 +81,13 @@ public class FlowImportExcel { @ApiModelProperty(value = "专业领域") @Excel(name = "专业领域", width = 15) private String domainArea; + /**配置需求*/ + @ApiModelProperty(value = "配置需求") + @Excel(name = "配置需求", width = 15) + private String configurationRequirements; /**新认证实施日期*/ @ApiModelProperty(value = "新认证实施日期") - @Excel(name = "新认证实施日期", width = 15) + @Excel(name = "新认证车实施日期", width = 15) private String newCerImplementDate; /**新生产车实施日期*/ @ApiModelProperty(value = "新生产车实施日期")