From 5ae4365262f7726e602e0dcc48d712104141c312 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 12 Jul 2024 18:32:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E5=88=97=E8=A1=A8=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStandardInterpretClauseSublist.java | 13 +++++++++++++ .../ProcessStandardInterpretClauseSublistMapper.xml | 2 ++ .../impl/StandardInterpretFlowServiceImpl.java | 6 ++++-- 3 files changed, 19 insertions(+), 2 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 506228ba..47be8384 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 @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.standardinterpret.entity; import com.baomidou.mybatisplus.annotation.TableField; +import com.jero.common.aspect.annotation.Dict; import com.jero.modules.laws.documenttool.entity.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -49,6 +50,7 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity { /**是否与上一版相同（字典：1：是，0：否）*/ @ApiModelProperty(value = "是否与上一版相同（字典：1：是，0：否）") @Excel(name = "是否与上一版相同", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") private String isSameAsPrevVersion; /**变化点说明*/ @ApiModelProperty(value = "相对上一版变化点说明") @@ -61,39 +63,49 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity { /**涉及系统/部件）*/ @ApiModelProperty(value = "涉及系统/部件）") @Excel(name = "涉及系统/部件", width = 15) + @Dict(dictTable = "laws_part_name", dicCode = "code", dicText = "name") private String keywords; /**涉及系统/部件）*/ @ApiModelProperty(value = "关键控制器）") @Excel(name = "关键控制器", width = 15, dicCode = "key_controller") + @Dict(dicCode = "key_controller") private String keyController; /**责任部门*/ @ApiModelProperty(value = "责任部门") @Excel(name = "责任部门", width = 15, dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") private String responsibleDepartment; /**责任部门专业模块*/ @ApiModelProperty(value = "责任部门专业模块") + @Dict(dicCode = "responsible_module") private String responsibleModule; /**关联部门*/ @ApiModelProperty(value = "关联部门") @Excel(name = "关联部门", width = 15, dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") private String relatedDepartment; /**关联部门专业模块*/ @ApiModelProperty(value = "关联部门专业模块") + @Dict(dicCode = "related_module") private String relatedModule; /**适用车型*/ @ApiModelProperty(value = "适用车型") @Excel(name = "适用车型", width = 15, dicCode = "applicable_vehicle_type") + @Dict(dicCode = "applicable_vehicle_type") private String applications; /**动力类型*/ @ApiModelProperty(value = "动力类型") @Excel(name = "动力类型", width = 15, dicCode = "dynamic_type") + @Dict(dicCode = "dynamic_type") private String powerType; /**专业领域*/ @ApiModelProperty(value = "专业领域") @Excel(name = "专业领域", width = 15, dicCode = "professional_field") + @Dict(dicCode = "professional_field") private String domainArea; /**配置需求*/ @ApiModelProperty(value = "配置需求") + @Dict(dicCode = "configuration_requirements") private String configurationRequirements; /**新认证实施日期*/ @ApiModelProperty(value = "新认证实施日期") @@ -146,6 +158,7 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity { /**排查阶段*/ @ApiModelProperty(value = "排查阶段") @Excel(name = "排查阶段", width = 15, dicCode = "investigation_stage") + @Dict(dicCode = "investigation_stage") private java.lang.String investigationStage; /**p3*/ @ApiModelProperty(value = "p3") 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 f25df735..d2f8d02b 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 @@ -14,6 +14,7 @@ change_description, regulatory_notes, keywords, + key_controller, applicable_components, responsible_department, responsible_module, @@ -35,6 +36,7 @@ dfema, key_technology_decomposition_table, other_documents_templates, + investigation_stage, p3, p5, remarks, 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 f52edee7..e1aaa367 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 @@ -1297,8 +1297,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe processStandardInterpretClauseService.saveOrUpdateBatch(newProcessStandardInterpretClauseList); } - map.put(StandardInterpretCommon.PASS_FIRST, - Integer.parseInt(processStandardInterpret.getIsDistribute())); + if (StringUtils.isNotBlank(processStandardInterpret.getIsDistribute())){ + map.put(StandardInterpretCommon.PASS_FIRST, + Integer.parseInt(processStandardInterpret.getIsDistribute())); + } processStandardInterpretService.updateById(processStandardInterpret); break; // 标准主解读汇总（分发）