完善关键零部件型号库

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;
+
 
     /**
      * 申请人

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;
+
     /**
      * 申请人
      */

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
     </select>
 </mapper>