fix(jg):bug处理

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

@@ -39,6 +39,8 @@ import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.discardOrder.factory.DiscardOrderCheckFactory;
 import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
+import com.yeejoin.amos.boot.module.jg.biz.edit.utils.DiffUtils;
+import com.yeejoin.amos.boot.module.jg.biz.edit.utils.JsonDiffUtil;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -396,7 +398,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             BeanUtil.beanToMap(equip, objectHashMap, false, false);
             objectHashMap.replaceAll((k, v) -> v == null ? "" : v);
             objectHashMap.put("record", equip.getSEQUENCE_NBR());
-            objectHashMap.put("ADDRESS", concatDetailAddress(equip));
+            String address = concatDetailAddress(equip);
+            objectHashMap.put("ADDRESS", JsonDiffUtil.isNullOrEmpty(address) ? "" : address);
             arrayList.add(objectHashMap);
         });
         return arrayList;

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

@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
+import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.EquipCategoryTypeHandler;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -166,6 +167,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     @Autowired
     private CodeUtil codeUtil;
 
+    @Autowired
+    private EquipCategoryTypeHandler equipCategoryTypeHandler;
+
     /**
      * 根据sequenceNbr查询
      *
@@ -720,7 +724,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         taskMessageDto.setNextTaskId(maintainNotice.getNextTaskId());
         dto.setModel(taskMessageDto);
         //摘要 按原有规则组装
-        dto.setTaskContent(String.format("来自%s的业务办理，【申请单号%s】",maintainNotice.getEquList(), maintainNotice.getApplyNo()));
+        dto.setTaskContent(String.format("来自%s的业务办理，【申请单号%s】",equipCategoryTypeHandler.handle(maintainNotice.getEquListCode()), maintainNotice.getApplyNo()));
         //申请单号
         dto.setTaskCode(maintainNotice.getApplyNo());
         //业务类型枚举code值
@@ -761,7 +765,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         taskMessageDto.setNextTaskId(dto.getNextTaskId());
         taskModelDto.setModel(taskMessageDto);
         taskModelDto.setNextExecuteUser(dto.getNextExecuteIds());
-        taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】",dto.getEquList(), dto.getApplyNo()));
+        taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】", equipCategoryTypeHandler.handle(dto.getEquListCode()), dto.getApplyNo()));
         taskModelDtoList.add(taskModelDto);
         if (bool) {
             // 删除暂存时生成的待办