feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.21</version>
+	<version>1.0.22</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/property/service/impl/SocialServiceImpl.java

@@ -130,7 +130,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
         TpTicket tic = tpTicketMapper.selectById(Integer.valueOf(ticketId));
         // 评价成功加积分
-        applicationContext.publishEvent(new EventBus(tic, EventBus.EventType.DocumentVerify,1));
+        applicationContext.publishEvent(new EventBus(tic, EventBus.EventType.TicketEvaluation,1));
     }
 
 

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -555,7 +555,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         // 获取联系号码簿（物业号码）
         // List<TpannouncementTel> tpannouncementTel = tpannouncementTelMapper.getTpannouncementTel();
 
-        // 查询参数
+        // 查询参 数
         Map<String, Object> lastRecordMap = Maps.newHashMap();
         // 表示查询出最新的一条
         lastRecordMap.put("size", 1);
@@ -570,8 +570,10 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
             // 报修类型：0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
             String repairType = e.getRepairType();
             TpRepairType tpRepairType = repairTypeMapper.selectById(repairType);
-            String repairName =  tpRepairType.getTypeName();
-            tpTicketVO.setRepairName(repairName);
+            if (null != tpRepairType){
+                String repairName =  tpRepairType.getTypeName();
+                tpTicketVO.setRepairName(repairName);
+            }
             tpTicketVO.setStatus(recordList.get(recordList.size() - 1).getStatus());
             tpTicketVO.setTicketStatusName(recordList.get(recordList.size() - 1).getTicketStatusName());
             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
             // 报修类型：0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
             String repairType = ticket.getRepairType();
             TpRepairType tpRepairType = repairTypeMapper.selectById(repairType);
-            String repairName = tpRepairType.getTypeName();
-            ticket.setRepairName(repairName);
+            if (null != tpRepairType){
+                String repairName = tpRepairType.getTypeName();
+                ticket.setRepairName(repairName);
+            }
 
 //            // 把该工单的消息变为 已读
 //            TpMessage tpMessage = new TpMessage();