暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/AppApplication.java

@@ -31,7 +31,7 @@ public class AppApplication {
 	public HttpMessageConverters fastJsonConfigure(){
 		FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
 		FastJsonConfig fastJsonConfig = new FastJsonConfig();
-		fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat);
+		fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat,SerializerFeature.DisableCircularReferenceDetect);
 		//日期格式化
 		//fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
 		converter.setFastJsonConfig(fastJsonConfig);

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -47,6 +47,9 @@ public class TicketServiceImpl implements ITicketService {
     @Autowired
     private TpMessageMapper tpMessageMapper;
 
+    @Autowired
+    private TpannouncementTelMapper tpannouncementTelMapper;
+
     @Override
     public ResponseBean getList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
 
@@ -114,6 +117,9 @@ public class TicketServiceImpl implements ITicketService {
      */
     public void tpTicketVOConvert(List<TpTicket> source, List<TpTicketVO> target) {
 
+        // 获取联系号码簿（物业号码）
+        List<TpannouncementTel> tpannouncementTel = tpannouncementTelMapper.getTpannouncementTel();
+
         // 查询参数
         Map<String, Object> lastRecordMap = Maps.newHashMap();
         // 表示查询出最新的一条
@@ -141,6 +147,11 @@ public class TicketServiceImpl implements ITicketService {
                 tpTicketVO.setCommentCreateDate(comment.getCreateDate());
             }
 
+            // 0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:被终止
+            if ("0".equals(e.getStatus())) {
+                tpTicketVO.setContactBook(tpannouncementTel);
+            }
+
             target.add(tpTicketVO);
         });
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -1,10 +1,13 @@
 package com.community.huiju.vo;
 
+import com.community.huiju.model.TpannouncementTel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 工单列表数据
@@ -60,4 +63,7 @@ public class TpTicketVO {
 
     /** 最新进展的时间 **/
     private Date commentCreateDate;
+
+    /** 联系物业号码簿 **/
+    private List<TpannouncementTel> contactBook;
 }