From 7cf884f6def68ffcbefb0c1c712e0b6797a36c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Sun, 29 Sep 2024 19:27:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=B3=E9=94=AE=E9=9B=B6?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=9E=8B=E5=8F=B7=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../part/entity/ProcessPartTypeApplyRecord.java | 13 +++++++++++++ .../jero/modules/laws/part/entity/LawsPartType.java | 13 +++++++++++++ .../laws/part/mapper/xml/LawsPartTypeMapper.xml | 1 - 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/entity/ProcessPartTypeApplyRecord.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/entity/ProcessPartTypeApplyRecord.java index 8b5217fa..754edfee 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/entity/ProcessPartTypeApplyRecord.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/entity/ProcessPartTypeApplyRecord.java @@ -99,6 +99,12 @@ public class ProcessPartTypeApplyRecord implements Serializable { @Excel(name = "生产厂家", width = 15, dicCode = "production_factory_code", dictTable = "laws_part_production_factory", dicText = "production_factory") @Dict(dicCode = "production_factory_code", dictTable = "laws_part_production_factory", dicText = "production_factory") private String productionFactory; + /** + * 关键零部件型号 + */ + @ApiModelProperty(value = "关键零部件型号") + @Excel(name = "关键零部件型号", width = 15) + private String partRelevanceType; /** * 适用车型 */ @@ -186,6 +192,13 @@ public class ProcessPartTypeApplyRecord implements Serializable { @Excel(name = "责任部门专业模块", width = 15, dicCode = "responsible_module") @TableField(exist = false) private String responsibleModule; + /** + * 代替关键零部件型号 + */ + @ApiModelProperty(value = "代替关键零部件型号") + @Excel(name = "代替关键零部件型号", width = 15) + private String replacePartNum; + /** * 申请人 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java index 3c190346..ce915f9c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java @@ -99,6 +99,12 @@ public class LawsPartType implements Serializable { @Excel(name = "生产厂家", width = 15, dicCode = "production_factory_code", dictTable = "laws_part_production_factory", dicText = "production_factory") @Dict(dicCode = "production_factory_code", dictTable = "laws_part_production_factory", dicText = "production_factory") private String productionFactory; + /** + * 关键零部件型号 + */ + @ApiModelProperty(value = "关键零部件型号") + @Excel(name = "关键零部件型号", width = 15) + private String partRelevanceType; /** * 适用车型 */ @@ -187,6 +193,13 @@ public class LawsPartType implements Serializable { @TableField(exist = false) private String responsibleModule; + /** + * 代替关键零部件型号 + */ + @ApiModelProperty(value = "代替关键零部件型号") + @Excel(name = "代替关键零部件型号", width = 15) + private String replacePartNum; + /** * 申请人 */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/mapper/xml/LawsPartTypeMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/part/mapper/xml/LawsPartTypeMapper.xml index cf692860..97de1f5f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/mapper/xml/LawsPartTypeMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/mapper/xml/LawsPartTypeMapper.xml @@ -37,6 +37,5 @@ left join sys_user_depart s2 on s2.user_id = s1.id left join sys_depart s3 on s3.id = s2.dep_id ${ew.customSqlSegment} - group by l1.id,s3.id