|
@@ -555,7 +555,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
|
555
|
555
|
// 获取联系号码簿(物业号码)
|
556
|
556
|
// List<TpannouncementTel> tpannouncementTel = tpannouncementTelMapper.getTpannouncementTel();
|
557
|
557
|
|
558
|
|
- // 查询参数
|
|
558
|
+ // 查询参 数
|
559
|
559
|
Map<String, Object> lastRecordMap = Maps.newHashMap();
|
560
|
560
|
// 表示查询出最新的一条
|
561
|
561
|
lastRecordMap.put("size", 1);
|
|
@@ -570,8 +570,10 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
|
570
|
570
|
// 报修类型:0:公共区域 1: 房屋质量 2::户内设施 PS : 报修的情况下才有报修类型
|
571
|
571
|
String repairType = e.getRepairType();
|
572
|
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
|
577
|
tpTicketVO.setStatus(recordList.get(recordList.size() - 1).getStatus());
|
576
|
578
|
tpTicketVO.setTicketStatusName(recordList.get(recordList.size() - 1).getTicketStatusName());
|
577
|
579
|
tpTicketVO.setTicketRecordDate(Date.from(recordList.get(recordList.size() - 1).getCreateDate().atZone(ZoneId.systemDefault()).toInstant()));
|
|
@@ -674,8 +676,10 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
|
674
|
676
|
// 报修类型:0:公共区域 1: 房屋质量 2::户内设施 PS : 报修的情况下才有报修类型
|
675
|
677
|
String repairType = ticket.getRepairType();
|
676
|
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
|
685
|
// TpMessage tpMessage = new TpMessage();
|