1.增加字段

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionApplicationEquip.java

@@ -39,4 +39,24 @@ public class JyjcInspectionApplicationEquip extends BaseEntity {
 	@TableField("remark")
     private String remark;
 
+    /**
+     * 设备种类
+     */
+    @TableField("equ_list")
+    private String equList;
+
+
+    /**
+     * 设备类别
+     */
+    @TableField("equ_category")
+    private String equCategory;
+
+
+    /**
+     * 设备品种
+     */
+    @TableField("equ_define")
+    private String equDefine;
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionResult.java

@@ -166,4 +166,18 @@ public class JyjcInspectionResult extends BaseEntity {
      */
     @TableField("result_type")
     private String resultType;
+
+
+    /**
+     * 设备种类
+     */
+    @TableField("equ_list")
+    private String equList;
+
+
+    /**
+     * 设备品种
+     */
+    @TableField("equ_define")
+    private String equDefine;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java

@@ -130,4 +130,8 @@ public class JyjcInspectionResultModel extends BaseModel {
 
     @ApiModelProperty(value = "附件类型(特种设备检验报告:1,监检证书:2)")
     private String attachmentType;
+
+
+    @ApiModelProperty(value = "设备品种")
+    private String equDefine;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -40,6 +40,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
+
 import static com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl.buildOrderNo;
 
 /**