启用停用暂存修改

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

@@ -219,7 +219,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             //申请单号
             dto.setTaskCode(jgEnableDisable.getApplyNo());
             //业务类型枚举code值
-            dto.setTaskType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
+            dto.setTaskType(BusinessTypeEnum.JG_EQUIPMENT_START.getCode());
             ////业务主键
             dto.setRelationId(jgEnableDisable.getSequenceNbr() + "");
             modelDtos.add(dto);
@@ -562,17 +562,19 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     public Map<String, Object> getDetail(Long sequenceNbr) {
         Map<String,Object> resultMap = this.baseMapper.getDetail(sequenceNbr);
         JgEnableDisableEq jgEnableDisableEq = jgEnableDisableEqMapper.selectOne(new LambdaQueryWrapper<JgEnableDisableEq>().eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr));
-        Map<String, Object> map = jgMaintainNoticeMapper.getEquipInfoByRecord(jgEnableDisableEq.getEquId());
-        map.put("equListDesc",map.get("equList"));
-        map.put("equCategoryDesc",map.get("equCategory"));
-        map.put("equDefineDesc",map.get("equDefine"));
-        String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
-                "insUseMaintainExplain", "inspectReport", "proxyStatementAttachment", "installContractAttachment"};
-        for (String s : fields) {
-            if (map.containsKey(s) && !ObjectUtils.isEmpty(map.get(s)))
-                map.put(s, JSON.parseArray(map.get(s).toString()));
+        if(!ObjectUtils.isEmpty(jgEnableDisableEq)){
+            Map<String, Object> map = jgMaintainNoticeMapper.getEquipInfoByRecord(jgEnableDisableEq.getEquId());
+            map.put("equListDesc",map.get("equList"));
+            map.put("equCategoryDesc",map.get("equCategory"));
+            map.put("equDefineDesc",map.get("equDefine"));
+            String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
+                    "insUseMaintainExplain", "inspectReport", "proxyStatementAttachment", "installContractAttachment"};
+            for (String s : fields) {
+                if (map.containsKey(s) && !ObjectUtils.isEmpty(map.get(s)))
+                    map.put(s, JSON.parseArray(map.get(s).toString()));
+            }
+            resultMap.putAll(map);
         }
-        resultMap.putAll(map);
         return resultMap;
 
     }