傅行帆 4 年之前
父節點
當前提交
1db9fcc99d
共有 1 個文件被更改,包括 9 次插入5 次删除
  1. 9
    5
      src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

+ 9
- 5
src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java 查看文件

555
         // 获取联系号码簿(物业号码)
555
         // 获取联系号码簿(物业号码)
556
         // List<TpannouncementTel> tpannouncementTel = tpannouncementTelMapper.getTpannouncementTel();
556
         // List<TpannouncementTel> tpannouncementTel = tpannouncementTelMapper.getTpannouncementTel();
557
 
557
 
558
-        // 查询参数
558
+        // 查询参 
559
         Map<String, Object> lastRecordMap = Maps.newHashMap();
559
         Map<String, Object> lastRecordMap = Maps.newHashMap();
560
         // 表示查询出最新的一条
560
         // 表示查询出最新的一条
561
         lastRecordMap.put("size", 1);
561
         lastRecordMap.put("size", 1);
570
             // 报修类型:0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
570
             // 报修类型:0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
571
             String repairType = e.getRepairType();
571
             String repairType = e.getRepairType();
572
             TpRepairType tpRepairType = repairTypeMapper.selectById(repairType);
572
             TpRepairType tpRepairType = repairTypeMapper.selectById(repairType);
573
-            String repairName =  tpRepairType.getTypeName();
574
-            tpTicketVO.setRepairName(repairName);
573
+            if (null != tpRepairType){
574
+                String repairName =  tpRepairType.getTypeName();
575
+                tpTicketVO.setRepairName(repairName);
576
+            }
575
             tpTicketVO.setStatus(recordList.get(recordList.size() - 1).getStatus());
577
             tpTicketVO.setStatus(recordList.get(recordList.size() - 1).getStatus());
576
             tpTicketVO.setTicketStatusName(recordList.get(recordList.size() - 1).getTicketStatusName());
578
             tpTicketVO.setTicketStatusName(recordList.get(recordList.size() - 1).getTicketStatusName());
577
             tpTicketVO.setTicketRecordDate(Date.from(recordList.get(recordList.size() - 1).getCreateDate().atZone(ZoneId.systemDefault()).toInstant()));
579
             tpTicketVO.setTicketRecordDate(Date.from(recordList.get(recordList.size() - 1).getCreateDate().atZone(ZoneId.systemDefault()).toInstant()));
674
             // 报修类型:0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
676
             // 报修类型:0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
675
             String repairType = ticket.getRepairType();
677
             String repairType = ticket.getRepairType();
676
             TpRepairType tpRepairType = repairTypeMapper.selectById(repairType);
678
             TpRepairType tpRepairType = repairTypeMapper.selectById(repairType);
677
-            String repairName = tpRepairType.getTypeName();
678
-            ticket.setRepairName(repairName);
679
+            if (null != tpRepairType){
680
+                String repairName = tpRepairType.getTypeName();
681
+                ticket.setRepairName(repairName);
682
+            }
679
 
683
 
680
 //            // 把该工单的消息变为 已读
684
 //            // 把该工单的消息变为 已读
681
 //            TpMessage tpMessage = new TpMessage();
685
 //            TpMessage tpMessage = new TpMessage();