Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 2a5a5359 9aa93546
Showing 4 changed files with 6 additions and 1 deletions
fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowPoolDTO.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/pool/FollowPoolListVO.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java
@@ -9,6 +9,7 @@
         SELECT t1.id,
         if(t1.type=3 , t4.plate_no, t3.plate_no)plate_no,
         if(t1.type=3 , t4.frame_no, t3.frame_no)frame_no,
+        if(t1.type=3 , t4.mobile, t5.mobile)    mobile,
         t3.cus_level                            cus_level,
         t2.expires                              loan_expires,
         t1.type                                 type,
@@ -33,6 +34,7 @@
         t1.group_id                             group_id
         FROM follow_task t1
         left join customer t3 on t1.customer_id = t3.id
+        left join customer_base_info t5 on t3.base_id = t5.id
         left join accident_pool t4 on t1.customer_id = t4.id
         left join customer_loan_info t2 on t3.frame_no = t2.frame_no and t3.group_id = t2.group_id
         <where>
@@ -16,6 +16,7 @@ public class FollowPoolDTO {
      * 车牌号
      */
     private String plateNo;
+    private String mobile;
     /**
      * 客户星级
      */
@@ -98,6 +99,7 @@ public class FollowPoolDTO {
     private Date closeTime;
     /**
      * 战败类型
+     *
      * @see cn.fw.valhalla.domain.enums.TaskDefeatTypeEnum
      */
     private Integer initiative;
@@ -18,6 +18,7 @@ public class FollowPoolListVO {
      * 车牌号
      */
     private String plateNo;
+    private String mobile;
     /**
      * 客户星级
      */
@@ -207,7 +207,7 @@ public class FollowBizService {
                 .append(";")
                 .append("手机号：")
                 .append(staffInfo.getMobile())
-                .append(";微信同号");
+                .append("; 微信同号。");
         return template.toString();
     }