Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

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

      * 性别
      */
     private Integer sex;
+
+    private String remark;
 }

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/service/impl/TaRecommendCustomerServiceImpl.java

         channelCustomer.setStatus("1");
         channelCustomer.setChannelId(taChannelPeople.getChannelId());
         channelCustomer.setOrgId(channelReportDTO.getOrgId());
+        channelCustomer.setRemark(channelReportDTO.getRemark());
         channelCustomerMapper.insert(channelCustomer);
         return ResponseBean.success(channelCustomer);
     }

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

             if (StringUtils.isEmpty(channelCustomer.getCustomerId())){
                 return ResponseBean.success(channelCustomer);
             }
-            responseBean.addSuccess(taRecommendCustomerService.getCustDetail(channelCustomer.getCustomerId()));
+            responseBean = taRecommendCustomerService.getCustDetail(channelCustomer.getCustomerId());
         }catch (Exception e){
             e.printStackTrace();
             logger.error("channelCustomerDelete -=- {}",e.toString());

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/java/com/yunzhi/marketing/xlk/entity/CustomerPreparatory.java

 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
     /**
      * 客户认筹id
      */
+    @TableId(type = IdType.UUID)
     private String customerPreparatoryId;
 
     /**

src/main/java/com/yunzhi/marketing/xlk/entity/CustomerSignatory.java

 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
     /**
      * 主键
      */
+    @TableId(type = IdType.UUID)
     private String customerSignatoryId;
 
     /**

src/main/java/com/yunzhi/marketing/xlk/entity/CustomerVisit.java

 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
     /**
      * 客户到访id
      */
+    @TableId(type = IdType.UUID)
     private String customerVisitId;
 
     /**

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
+import com.yunzhi.marketing.mapper.TaPersonMapper;
 import com.yunzhi.marketing.mapper.TaRecommendCustomerMapper;
 import com.yunzhi.marketing.po.MineRecommendCustomerPO;
 import com.yunzhi.marketing.po.TaRecommendCustomerPO;
 
     @Autowired
     private CustomerSignatoryMapper customerSignatoryMapper;
+
+    @Autowired
+    private TaPersonMapper taPersonMapper;
     /**
      * 审核
      *
 
         // 保存到访单
         CustomerVisit customerVisit = channelCustomerDTO.getCustomerVisit();
-        customerVisit.setCreateDate(LocalDateTime.now());
-        customerVisitMapper.insert(customerVisit);
+        customerVisit.setBuildingId(customer.getBuildingId());
+        customerVisit.setName(customer.getName());
+        customerVisit.setRecommendPerson(customer.getRecommendPerson());
+        TaPerson recommendPerson = taPersonMapper.getById(customer.getRecommendPerson());
+        if (null != recommendPerson) {
+            customerVisit.setRealtyConsultantName(recommendPerson.getName());
+        }
+        customerVisit.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
+        TaPerson channelPerson = taPersonMapper.getById(channelCustomerDTO.getRealtyConsultant());
+        if (null != channelPerson) {
+            customerVisit.setRealtyConsultantName(channelPerson.getName());
+        }
+        customerVisit.setOrgId(customer.getOrgId());
 
         // 审核通过 先查看在ta_recommend_customer 手机号是否存在
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
             // 审核通过
             customer.setStatus("2");
             customer.setCustomerId(taRecommendCustomer.getCustomerId());
+            customerVisit.setCustomerId(taRecommendCustomer.getCustomerId());
             customer.setVisitDate(LocalDateTime.now());
             channelCustomerMapper.updateById(customer);
-            return ResponseBean.success("审核成功");
-        }
-
-        if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
+        }else if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
                 (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
             // 审核通过
             customer.setStatus("2");
             customer.setCustomerId(recommendCustomer.getCustomerId());
+            customerVisit.setCustomerId(recommendCustomer.getCustomerId());
             customer.setVisitDate(LocalDateTime.now());
+            customer.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
             channelCustomerMapper.updateById(customer);
-            return ResponseBean.success("审核成功");
+        }else {
+            return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
+
+        customerVisit.setCreateDate(LocalDateTime.now());
+        customerVisitMapper.insert(customerVisit);
+
+        return ResponseBean.success("审核成功");
     }
 
     /**
      */
     @Override
     public ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params) {
+        CustomerVisit customerVisit = params.getCustomerVisit();
         // 渠道推荐的客户
         if ("report".equals(params.getType())) {
             ChannelCustomer customer = channelCustomerMapper.selectById(params.getId());
+
+            customerVisit.setBuildingId(customer.getBuildingId());
+            customerVisit.setName(customer.getName());
+            customerVisit.setRecommendPerson(customer.getRecommendPerson());
+            TaPerson recommendPerson = taPersonMapper.getById(customer.getRecommendPerson());
+            if (null != recommendPerson) {
+                customerVisit.setRealtyConsultantName(recommendPerson.getName());
+            }
+            customerVisit.setRealtyConsultant(params.getRealtyConsultant());
+            TaPerson channelPerson = taPersonMapper.getById(params.getRealtyConsultant());
+            if (null != channelPerson) {
+                customerVisit.setRealtyConsultantName(channelPerson.getName());
+            }
+            customerVisit.setOrgId(customer.getOrgId());
+
             // 审核通过 先查看在ta_recommend_customer 手机号是否存在
             LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(TaRecommendCustomer::getPhone,customer.getPhone());
                 customer.setStatus("2");
                 customer.setVisitDate(LocalDateTime.now());
                 customer.setCustomerId(taRecommendCustomer.getCustomerId());
+                customerVisit.setCustomerId(taRecommendCustomer.getCustomerId());
                 channelCustomerMapper.updateById(customer);
             }else if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
                     (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
                 customer.setStatus("2");
                 customer.setVisitDate(LocalDateTime.now());
                 customer.setCustomerId(recommendCustomer.getCustomerId());
+                customerVisit.setCustomerId(recommendCustomer.getCustomerId());
                 channelCustomerMapper.updateById(customer);
 
                 // 修改状态为确认到访状态
             taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
             taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
             taRecommendCustomer.setCirculationTime(LocalDateTime.now());
+            customerVisit.setCustomerId(taRecommendCustomer.getCustomerId());
             taRecommendCustomerMapper.updateById(taRecommendCustomer);
         }else {
             return ResponseBean.error("请输入正确的类型参数", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         // 保存到访单
-        CustomerVisit customerVisit = params.getCustomerVisit();
         customerVisit.setCreateDate(LocalDateTime.now());
         customerVisitMapper.insert(customerVisit);
 

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