1.自测bug修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintenanceContractDto.java

@@ -151,10 +151,20 @@ public class JgMaintenanceContractDto extends BaseDto {
 
     private List<String> roleIds;
 
+
+    /**
+     * 设备种类
+     */
+    private String equList;
+    /**
+     * 设备类别
+     */
+
+    private String equCategory;
+
     /**
      * 工作流下一节点任务id
      */
-    @TableField(value = "next_task_id")
     private String nextTaskId;
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintenanceContract.java

@@ -276,4 +276,17 @@ public class JgMaintenanceContract extends BaseEntity {
      */
     @TableField("transfer_to_user_ids")
     private String transferToUserIds;
+
+
+    /**
+     * 设备种类
+     */
+    @TableField("equ_list")
+    private String equList;
+
+    /**
+     * 设备类别
+     */
+    @TableField("equ_category")
+    private String equCategory;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgMaintenanceContractVo.java

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 @Data
-    public class JgMaintenanceContractVo {
+public class JgMaintenanceContractVo {
     @TableField("使用单位-提交-是否可操作")
     private Boolean submitIsFlag;
 
@@ -138,7 +138,7 @@ import java.util.Map;
     protected String recUserName;
 
     @ApiModelProperty(value = "是否删除")
-    private Boolean isDelete=false;
+    private Boolean isDelete = false;
 
     @ApiModelProperty("instance_status")
     private String instanceStatus;
@@ -152,10 +152,17 @@ import java.util.Map;
     @ApiModelProperty("status")
     private String status;
 
+
+    @ApiModelProperty("设备种类")
+    private String equList;
+
+    @ApiModelProperty("设备类别")
+    private String equCategory;
+
     private List<Map<String, Object>> equipmentLists;
 
     /**
-     *工作流下一节点任务id
+     * 工作流下一节点任务id
      */
     @ApiModelProperty("next_task_id")
     private String nextTaskId;

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

@@ -820,18 +820,17 @@ public class CommonServiceImpl implements ICommonService {
             JSONObject jsonObject = new JSONObject(noticeObj);
             return jgChangeRegistrationReformServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.YZBG.getBusinessCode())) {
-
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(YZBG_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
             return jgChangeRegistrationTransferService.createTransfer(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode())) {
-
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(DWBG_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
             return jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.WBBA.getBusinessCode())) {
+            noticeObj.put("equList", basicObj.get("code"));
             noticeObj.put("pageType", "add");
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java

@@ -42,7 +42,7 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Text)
     private String EQU_CATEGORY;
 
-    @Field(type = FieldType.Text)
+    @Field(type = FieldType.Keyword)
     private String EQU_CATEGORY_CODE;
 
     @Field(type = FieldType.Keyword)