张延森 4 年之前
父節點
當前提交
3c8b0d9f4b

+ 1
- 1
pom.xml 查看文件

10
 	</parent>
10
 	</parent>
11
 	<groupId>com.huiju</groupId>
11
 	<groupId>com.huiju</groupId>
12
 	<artifactId>xiangsong</artifactId>
12
 	<artifactId>xiangsong</artifactId>
13
-	<version>1.0.21</version>
13
+	<version>1.0.22</version>
14
 	<name>xiangsong</name>
14
 	<name>xiangsong</name>
15
 	<description>香颂</description>
15
 	<description>香颂</description>
16
 
16
 

+ 1
- 1
src/main/java/com/huiju/estateagents/property/service/impl/SocialServiceImpl.java 查看文件

130
 
130
 
131
         TpTicket tic = tpTicketMapper.selectById(Integer.valueOf(ticketId));
131
         TpTicket tic = tpTicketMapper.selectById(Integer.valueOf(ticketId));
132
         // 评价成功加积分
132
         // 评价成功加积分
133
-        applicationContext.publishEvent(new EventBus(tic, EventBus.EventType.DocumentVerify,1));
133
+        applicationContext.publishEvent(new EventBus(tic, EventBus.EventType.TicketEvaluation,1));
134
     }
134
     }
135
 
135
 
136
 
136
 

+ 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();