启用停用、维修告知完成列表返回

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

@@ -153,4 +153,12 @@ public class JgEnableDisable extends BaseEntity {
     @TableField(exist = false)
     private String supervisoryCode;
 
+    @TableField(exist = false)
+    private String equCategory;
+
+    @TableField(exist = false)
+    private String productName;
+
+    @TableField(exist = false)
+    private String address;
 }

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

@@ -257,7 +257,7 @@ public class JgMaintainNotice extends BaseEntity {
     private String useUnitName;
 
     /**
-     * 维修类型（1一般维修，2重点维修）
+     * 维修类型（10000一般维修，10001 重点维修）
      */
     @TableField("maintain_type")
     private String maintainType;
@@ -332,4 +332,14 @@ public class JgMaintainNotice extends BaseEntity {
 
     @TableField(exist = false)
     private String supervisoryCode;
+    /**
+     * 维修类型名称
+     */
+    @TableField(exist = false)
+    private String maintainTypeDesc;
+    /**
+     * 设备地址
+     */
+    @TableField(exist = false)
+    private String fullAddress;
 }

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/JgEnableDisableServiceImpl.java

@@ -110,6 +110,11 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         String instanceId = "";
         jgEnableDisable.setEquList("null".equals(record) ? "null" : map.get("equListDesc").toString());
         jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : map.get("supervisoryCode").toString());
+
+        jgEnableDisable.setEquCategory(ObjectUtils.isEmpty(map.get("equCategoryDesc")) ? null : map.get("equCategoryDesc").toString());
+        jgEnableDisable.setProductName(ObjectUtils.isEmpty(map.get("productName")) ? null : map.get("productName").toString());
+        jgEnableDisable.setAddress(ObjectUtils.isEmpty(map.get("fullAddress")) ? null : map.get("fullAddress").toString());
+
         if (SUBMIT_TYPE_FLOW.equals(submit)) {
             if (map.containsKey("instanceId") && !ObjectUtils.isEmpty(map.get("instanceId"))){
                 // 只调用执行API，返回下个节点信息，用于填充业务字段

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/JgMaintainNoticeServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
@@ -92,6 +93,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     RedisUtils redisUtils;
 
     @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
+    @Autowired
     private TzBaseUnitLicenceMapper baseUnitLicenceMapper;
 
     @Autowired
@@ -453,6 +457,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
+            DataDictionary dictionary = iDataDictionaryService.getByCode(dto.getMaintainType(),"WXLX");
+            dto.setMaintainTypeDesc(dictionary.getName());
+            dto.setFullAddress(dto.getProvinceName() + dto.getCityName() + dto.getCountyName() + dto.getStreetName() + dto.getAddress());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });