feats

src/main/java/com/huiju/estateagents/controller/TsConsultantKpiController.java

@@ -57,7 +57,7 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @RequestMapping(value="/consultant/kpi",method= RequestMethod.GET)
-    public ResponseBean tsConsultantKpiList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean stsConsultantKpiList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             // startDate 默认格式 YYYYMMDD
                                             @RequestParam(value ="startDate", required = false) String startDate,
@@ -100,7 +100,7 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @RequestMapping(value="/consultant/kpi",method= RequestMethod.POST)
-    public ResponseBean tsConsultantKpiList(// startDate 默认格式 YYYYMMDD
+    public ResponseBean stsConsultantKpiExport(// startDate 默认格式 YYYYMMDD
                                             @RequestParam(value ="startDate", required = false) String startDate,
                                             @RequestParam(value ="endDate", required = false) String endDate,
                                             @RequestParam(value ="buildingId", required = false) String buildingId,
@@ -163,7 +163,7 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @GetMapping("/consultant/customer")
-    public ResponseBean tsConsultantKpiList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean getConsultantCustomers(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @RequestParam(value ="buildingId", required = false) String buildingId,
                                             @RequestParam(value ="userId") String userId,
@@ -267,6 +267,7 @@ public class TsConsultantKpiController extends BaseController {
                                                      @RequestParam(value ="userId") String userId,
                                                      @RequestParam(value ="startDate", required = false) String startDate,
                                                      @RequestParam(value ="endDate", required = false) String endDate,
+                                                   @RequestParam(value ="personId", required = false) String personId,
                                                      HttpServletRequest request) {
         LocalDateTime[] dateRange = {null, null};
         try {
@@ -277,7 +278,7 @@ public class TsConsultantKpiController extends BaseController {
 
         Integer orgId = getOrgId(request);
         IPage<TaPerson> page = new Page<>(pageNum, pageSize);
-        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantHomePageTimes(page, orgId, userId, buildingId, dateRange[0], dateRange[1]);
+        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantHomePageTimes(page, orgId, userId, buildingId, dateRange[0], dateRange[1], personId);
         return ResponseBean.success(result);
     }
 
@@ -435,6 +436,8 @@ public class TsConsultantKpiController extends BaseController {
                                                   @RequestParam(value ="endDate", required = false) String endDate,
                                                   @RequestParam(value ="targetType", required = false) String targetType,
                                                   @RequestParam(value ="targetName", required = false) String targetName,
+                                                @RequestParam(value ="userName", required = false) String userName,
+                                                @RequestParam(value ="personId", required = false) String personId,
                                                   HttpServletRequest request) {
         LocalDateTime[] dateRange = {null, null};
         try {
@@ -443,9 +446,14 @@ public class TsConsultantKpiController extends BaseController {
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        // 如果 personId 与 userName 同时存在, 以 personId 为准
+        if (!StringUtils.isEmpty(personId)) {
+            userName = null;
+        }
+
         Integer orgId = getOrgId(request);
         IPage<TaPerson> page = new Page<>(pageNum, pageSize);
-        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantShareTimes(page, orgId, userId, buildingId, dateRange[0], dateRange[1], targetType, targetName);
+        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantShareTimes(page, orgId, userId, buildingId, dateRange[0], dateRange[1], targetType, targetName, userName, personId);
         return ResponseBean.success(result);
     }
 

src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java

@@ -197,6 +197,5 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
                                                            @Param("userId") String userId,
                                                            @Param("buildingId") String buildingId,
                                                            @Param("startDate") LocalDateTime startDate,
-                                                           @Param("endDate") LocalDateTime endDate
-                                                            );
+                                                           @Param("endDate") LocalDateTime endDate);
 }

src/main/java/com/huiju/estateagents/mapper/TsConsultantKpiMapper.java

@@ -96,7 +96,8 @@ public interface TsConsultantKpiMapper extends BaseMapper<TsConsultantKpi> {
                                                @Param("userId") String userId,
                                                @Param("buildingId") String buildingId,
                                                @Param("startDate") LocalDateTime startDate,
-                                               @Param("endDate") LocalDateTime endDate);
+                                               @Param("endDate") LocalDateTime endDate,
+                                               @Param("personId") String personId);
 
     /**
      * 咨询置业人员
@@ -190,5 +191,7 @@ public interface TsConsultantKpiMapper extends BaseMapper<TsConsultantKpi> {
                                             @Param("startDate") LocalDateTime startDate,
                                             @Param("endDate") LocalDateTime endDate,
                                             @Param("targetType") String targetType,
-                                            @Param("targetName") String targetName);
+                                            @Param("targetName") String targetName,
+                                            @Param("userName") String userName,
+                                            @Param("personId") String personId);
 }

src/main/java/com/huiju/estateagents/service/ITsConsultantKpiService.java

@@ -30,7 +30,7 @@ public interface ITsConsultantKpiService extends IService<TsConsultantKpi> {
 
     IPage<TaPerson> getConsultantHomePagePersons(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
 
-    IPage<TaPerson> getConsultantHomePageTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
+    IPage<TaPerson> getConsultantHomePageTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String personId);
 
     IPage<TaPerson> getConsultantChatPersons(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
 
@@ -40,5 +40,5 @@ public interface ITsConsultantKpiService extends IService<TsConsultantKpi> {
 
     IPage<TaPerson> getConsultantSharePersons(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
 
-    IPage<TaPerson> getConsultantShareTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String targetType, String targetName);
+    IPage<TaPerson> getConsultantShareTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String targetType, String targetName, String userName, String personId);
 }

src/main/java/com/huiju/estateagents/service/impl/TsConsultantKpiServiceImpl.java

@@ -75,8 +75,8 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
     }
 
     @Override
-    public IPage<TaPerson> getConsultantHomePageTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
-        return tsConsultantKpiMapper.getConsultantHomePageTimes(page, orgId, userId, buildingId, startDate, endDate);
+    public IPage<TaPerson> getConsultantHomePageTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String personId) {
+        return tsConsultantKpiMapper.getConsultantHomePageTimes(page, orgId, userId, buildingId, startDate, endDate, personId);
     }
 
     @Override
@@ -103,9 +103,9 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
     }
 
     @Override
-    public IPage<TaPerson> getConsultantShareTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String targetType, String targetName) {
+    public IPage<TaPerson> getConsultantShareTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String targetType, String targetName, String userName, String personId) {
         // buildingId 在表里不一定有数据, 实际执行 SQL 中没有这个条件
-        return tsConsultantKpiMapper.getConsultantShareTimes(page, orgId, userId, buildingId, startDate, endDate, targetType, targetName);
+        return tsConsultantKpiMapper.getConsultantShareTimes(page, orgId, userId, buildingId, startDate, endDate, targetType, targetName, userName, personId);
     }
 
 }

src/main/resources/application-blue.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: root
     password: LUfZGvh7j1^qA*2c
-    url: jdbc:mysql://123.57.65.31:3306/estateagents_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://123.57.65.31:3306/estateagents_20200417?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -13,6 +13,7 @@
                 t.building_name,
                 t.user_id,
                 t.user_name,
+                t.phone,
                 IFNULL(sum( t.new_persons ),0) AS new_persons,
                 IFNULL(sum( t.share_num ),0) AS share_num,
                 IFNULL(sum( t.visit_persons ),0) AS visit_persons,
@@ -148,11 +149,12 @@
         </if>
         -->
         AND e.is_first_time = 1
+
         AND t.phone is not null
 
 <!--        为了与存储过程一致 -->
 <!--        AND t.`status` = 1-->
-        ORDER BY e.create_date DESC;
+        ORDER BY e.create_date DESC
     </select>
 
     <select id="getConsultantHomePagePersons" resultType="com.huiju.estateagents.entity.TaPerson">
@@ -177,8 +179,8 @@
 
 <!--        为了与存储过程一致 -->
 <!--            AND s.`status` = 1-->
-        GROUP BY t.person_id
-        ORDER BY t.create_date DESC;
+        GROUP BY t.person_id, DATE_FORMAT(t.create_date, '%Y%m%d')
+        ORDER BY t.create_date DESC
     </select>
 
     <select id="getConsultantHomePageTimes" resultType="com.huiju.estateagents.entity.TaPerson">
@@ -202,7 +204,10 @@
 
 <!--        为了与存储过程一致 -->
 <!--            AND s.`status` = 1-->
-        ORDER BY t.create_date DESC;
+        <if test="personId != null and personId !=''">
+            AND t.person_id = #{personId}
+        </if>
+        ORDER BY t.create_date DESC
     </select>
 
     <select id="getConsultantChatPersons" resultType="com.huiju.estateagents.entity.TaPerson">
@@ -223,7 +228,7 @@
 <!--        为了与存储过程一致 -->
 <!--            AND s.`status` = 1-->
         GROUP BY
-            t.person_id
+            t.person_id, DATE_FORMAT(h.create_date, '%Y%m%d')
         ORDER BY
             h.create_date DESC
     </select>
@@ -231,7 +236,7 @@
     <select id="getConsultantFavor" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
             t.*,
-            max( i.create_date ) AS visit_time
+            i.create_date AS visit_time
         FROM
             ta_person t
         INNER JOIN ta_favor i ON i.person_id = t.person_id
@@ -302,14 +307,14 @@
             </if>
             -->
 <!--            AND t.`status` = 1-->
-        GROUP BY t.person_id
+        GROUP BY t.person_id, DATE_FORMAT(e.create_date, '%Y%m%d')
         ORDER BY e.create_date DESC
     </select>
 
     <select id="getConsultantShareTimes" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
             t.*,
-            e.create_date as visit_times,
+            e.create_date as visit_time,
             e.target_type,
             e.target_id,
             e.target_name
@@ -338,6 +343,13 @@
                 AND e.building_id = #{buildingId}
             </if>
             -->
+
+        <if test="personId != null and personId !=''">
+            AND t.person_id = #{personId}
+        </if>
+        <if test="userName != null and userName !=''">
+            AND t.nickname like concat('%', #{userName} ,'%')
+        </if>
             <!--            AND t.`status` = 1-->
         ORDER BY e.create_date DESC
     </select>