统计调整

src/main/java/com/yunzhi/marketing/dto/StatisticsDTO.java

     private Integer channelId;
 
     private String type;
+
+    private String customerType;
 }

src/main/java/com/yunzhi/marketing/service/impl/ChannelCustomerStatisticsServiceImpl.java

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
         }
         statisticsDTo.setChannelId(taChannelPerson.getChannelId());
 
-        // 获取新增客户
-        List<CustomerDetailVO> newCustomerDetail = channelCustomerMapper.getNewCustomerDetail(statisticsDTo);
-        // 获取跟进客户
-        List<CustomerDetailVO> followCustomerDetail = customerVisitMapper.getFollowCustomerDetail(statisticsDTo);
-        // 获取成交客户
-        List<CustomerDetailVO> successCustomerDetail = channelCustomerMapper.getSuccessCustomerDetail(statisticsDTo);
-        Map<String,Object> map = new HashMap<>();
-        map.put("newCustomerDetail",newCustomerDetail);
-        map.put("followCustomerDetail",followCustomerDetail);
-        map.put("successCustomerDetail",successCustomerDetail);
-        return ResponseBean.success(map);
+        List<CustomerDetailVO> customerDetail = new ArrayList<>();
+        if ("new".equals(statisticsDTo.getCustomerType())){
+            // 获取新增客户
+            customerDetail = channelCustomerMapper.getNewCustomerDetail(statisticsDTo);
+        }else if ("follow".equals(statisticsDTo.getCustomerType())){
+            // 获取跟进客户
+            customerDetail = customerVisitMapper.getFollowCustomerDetail(statisticsDTo);
+        }else if ("success".equals(statisticsDTo.getCustomerType())) {
+            // 获取成交客户
+            customerDetail = channelCustomerMapper.getSuccessCustomerDetail(statisticsDTo);
+        }
+        return ResponseBean.success(customerDetail);
     }
 }

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerStatisticsController.java

 
     @ApiOperation(value = "wx-龙虎榜排名数据", notes = "wx-龙虎榜排名数据")
     @GetMapping(value="/wx/ranklist")
-    public ResponseBean getRanklist(@RequestParam("buildingId") String buildingId,
-                                    @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+    public ResponseBean getRanklist(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
                                     @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate,
                                     @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
 
         // 构造参数
         StatisticsDTO statisticsDTo = new StatisticsDTO();
-        statisticsDTo.setBuildingId(buildingId);
         statisticsDTo.setStartDate(startDate);
         statisticsDTo.setEndDate(endDate);
         statisticsDTo.setOrgId(orgId);
 
     @ApiOperation(value = "wx-销售简报", notes = "wx-销售简报")
     @GetMapping(value="/wx/briefing")
-    public ResponseBean getBriefing(@RequestParam("buildingId") String buildingId,
-                                    @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+    public ResponseBean getBriefing(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
                                     @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate,
                                     @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
 
         // 构造参数
         StatisticsDTO statisticsDTo = new StatisticsDTO();
-        statisticsDTo.setBuildingId(buildingId);
         statisticsDTo.setStartDate(startDate);
         statisticsDTo.setEndDate(endDate);
         statisticsDTo.setOrgId(orgId);
         return  channelCustomerStatisticsService.getBriefing(statisticsDTo);
     }
 
-    @ApiOperation(value = "wx-销售简报", notes = "wx-销售简报")
+    @ApiOperation(value = "wx-销售简报折线图", notes = "wx-销售简报折线图")
     @GetMapping(value="/wx/briefing/detail")
-    public ResponseBean getBriefingDetail(@RequestParam("buildingId") String buildingId,
-                                    @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
-                                    @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate,
+    public ResponseBean getBriefingDetail(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+                                    @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate, @RequestParam(value = "customerType") String customerType,
                                     @RequestParam(value = "type") String type,
-                                    @RequestHeader("authorization") String token, HttpServletRequest request){
+                                    @RequestHeader("authorization") String token,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
 
         // 构造参数
         StatisticsDTO statisticsDTo = new StatisticsDTO();
-        statisticsDTo.setBuildingId(buildingId);
         statisticsDTo.setStartDate(startDate);
         statisticsDTo.setEndDate(endDate);
         statisticsDTo.setOrgId(orgId);
         statisticsDTo.setPersonId(person.getPersonId());
         statisticsDTo.setType(type);
+        statisticsDTo.setCustomerType(customerType);
         return  channelCustomerStatisticsService.getBriefingDetail(statisticsDTo);
     }
 }

src/main/resources/mapper/xlk/ChannelCustomerMapper.xml

             p.avatarurl
         FROM
             xlk_channel_customer t
+        INNER JOIN xlk_customer_visit v on t.customer_id = v.customer_id
         LEFT JOIN ta_person p on t.recommend_person = p.person_id
         WHERE t.channel_id  = #{params.channelId}
-        and t.building_id = #{params.buildingId}
-        and t.`status` != 3
         <if test="params.startDate != null or params.endDate != null">
             AND t.create_date BETWEEN #{params.startDate} and #{params.endDate}
         </if>
         FROM
         xlk_channel_customer t
         WHERE t.channel_id  = #{params.channelId}
-        and t.building_id = #{params.buildingId}
         and t.`status` = 1
         <if test="params.startDate != null or params.endDate != null">
             AND t.create_date BETWEEN #{params.startDate} and #{params.endDate}
         xlk_channel_customer t
         LEFT join ta_recommend_customer r on t.customer_id = r.customer_id
         WHERE t.channel_id  = #{params.channelId}
-        and t.building_id = #{params.buildingId}
         and r.`status` in (4,5)
         <if test="params.startDate != null or params.endDate != null">
             AND t.create_date BETWEEN #{params.startDate} and #{params.endDate}
     </select>
     <select id="getNewCustomerDetail" resultType="com.yunzhi.marketing.xlk.vo.CustomerDetailVO">
         SELECT
-            date_format( t.create_date, '%Y-%m-%d' ) as coordinate,
+            <if test="params.type == 'day'">
+                date_format( t.create_date, '%Y-%m-%d' ) as coordinate,
+            </if>
+            <if test="params.type == 'month'">
+                date_format( t.create_date, '%Y-%m' ) as coordinate,
+            </if>
             COUNT(1) as customerNum
         FROM
         xlk_channel_customer t
         WHERE t.channel_id  = #{params.channelId}
-        and t.building_id = #{params.buildingId}
         and t.`status` = 1
         <if test="params.startDate != null or params.endDate != null">
             AND t.create_date BETWEEN #{params.startDate} and #{params.endDate}
     </select>
     <select id="getSuccessCustomerDetail" resultType="com.yunzhi.marketing.xlk.vo.CustomerDetailVO">
         SELECT
-            date_format( t.create_date, '%%Y-%m-%d' ) as coordinate,
+            <if test="params.type == 'day'">
+                date_format( t.create_date, '%Y-%m-%d' ) as coordinate,
+            </if>
+            <if test="params.type == 'month'">
+                date_format( t.create_date, '%Y-%m' ) as coordinate,
+            </if>
             COUNT(1) as customerNum
         FROM
         xlk_channel_customer t
         LEFT join ta_recommend_customer r on t.customer_id = r.customer_id
         WHERE t.channel_id  = #{params.channelId}
-        and t.building_id = #{params.buildingId}
         and r.`status` in (4,5)
         <if test="params.startDate != null or params.endDate != null">
             AND t.create_date BETWEEN #{params.startDate} and #{params.endDate}

src/main/resources/mapper/xlk/CustomerVisitMapper.xml

     </select>
     <select id="getFollowCustomerDetail" resultType="com.yunzhi.marketing.xlk.vo.CustomerDetailVO">
         SELECT
-            date_format( t.create_date, '%Y-%m-%d' ) as coordinate,
+            <if test="params.type == 'day'">
+                date_format( t.create_date, '%Y-%m-%d' ) as coordinate,
+            </if>
+            <if test="params.type == 'month'">
+                date_format( t.create_date, '%Y-%m' ) as coordinate,
+            </if>
             COUNT(1) as customerNum
         FROM
         xlk_channel_customer t