1

src/main/java/com/yunzhi/marketing/controller/TaRecommendCustomerController.java

 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
     public ResponseBean getCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId, HttpServletRequest request) {
         Integer orgId = getOrgId(request);
         try {
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, customerId, orgId, getTaPersonBuildingListByUserId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, customerId, orgId, getTaPersonBuildingListByUserId(request),null,null,null));
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
     }
 
     @GetMapping("/wx/customer/recommend/mine")
-    public ResponseBean getWxCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
+    public ResponseBean getWxCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize,
+                                                   @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 = "status", required = false) Integer status,
+                                                   HttpServletRequest request) {
         Integer orgId = getOrgId(request);
         String personId = getPersonId(request);
         TaPerson person = taPersonService.getById(personId);
         try {
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, person.getPersonId(), orgId, null));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, person.getPersonId(), orgId, null,startDate,endDate,status));
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/marketing/mapper/TaRecommendCustomerMapper.java

 
     List<PersonIntention> getCustomerIntentions(@Param("personId") String personId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-    IPage<TaRecommendCustomerPO> getCustomersIRecommended(IPage<TaRecommendCustomerPO> page, @Param("customerId") String customerId, @Param("status") Integer status, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaRecommendCustomerPO> getCustomersIRecommended(IPage<TaRecommendCustomerPO> page, @Param("customerId") String customerId, @Param("status") Integer status, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("startDate") LocalDateTime startDate,@Param("endDate") LocalDateTime endDate);
 
     /**
      * @param page

src/main/java/com/yunzhi/marketing/po/TaRecommendCustomerPO.java

 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class TaRecommendCustomerPO {
 
     private String sex;
 
     private String type;
+
+    private String buildingId;
+
+    private LocalDateTime createDate;
+
+    /**
+     * 过了保护期的时间
+     */
+    private LocalDateTime expirationDate;
 }

src/main/java/com/yunzhi/marketing/service/ITaRecommendCustomerService.java

 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.po.TaRecommendCustomerPO;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
 
     TaRecommendCustomer getCustomerById(String customerId);
 
-    IPage<TaRecommendCustomerPO> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
+    IPage<TaRecommendCustomerPO> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, LocalDateTime startDate,LocalDateTime endDate,Integer status);
 
     TaRecommendCustomer newByPerson(TaPerson person);
 

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

     }
 
     @Override
-    public IPage<TaRecommendCustomerPO> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+    public IPage<TaRecommendCustomerPO> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, LocalDateTime startDate,LocalDateTime endDate,Integer status) {
 
 //        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         // todo
         // 此处可能不是 person_id 而是 recommend_person
         IPage<TaRecommendCustomerPO> page = new Page<>(pageNumber, pageSize);
-//        queryWrapper.eq("recommend_person",customerId);
-////        queryWrapper.eq("building_id",building);
-//        queryWrapper.eq("status", CommConstant.VERIFY_AGREE);
-//        queryWrapper.eq("org_id", orgId);
-        return taRecommendCustomerMapper.getCustomersIRecommended(page, customerId, CommConstant.STATUS_NORMAL, orgId, taPersonBuildingList);
+        IPage<TaRecommendCustomerPO> customersIRecommended = taRecommendCustomerMapper.getCustomersIRecommended(page, customerId, status, orgId, taPersonBuildingList, startDate, endDate);
+        List<TaRecommendCustomerPO> records = customersIRecommended.getRecords();
+        records.forEach(e -> {
+            LambdaQueryWrapper<BuildingChannel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(BuildingChannel::getBuildingId,e.getBuildingId());
+            BuildingChannel buildingChannel = buildingChannelMapper.selectOne(lambdaQueryWrapper);
+
+            if (null != buildingChannel) {
+                Integer expirationDay = buildingChannel.getExpirationDate();
+                LocalDateTime expirationDate = e.getCreateDate().plusDays(expirationDay);
+                e.setExpirationDate(expirationDate);
+            }
+        });
+        return customersIRecommended;
     }
 
     @Override

src/main/java/com/yunzhi/marketing/xlk/mapper/ChannelCustomerMapper.java

 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.marketing.dto.StatisticsDTO;
+import com.yunzhi.marketing.po.CustomerRankListVO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 渠道报备客户表  Mapper 接口
                                           @Param("recommendPhone") String recommendPhone,
                                           @Param("status") String status,@Param("type") String type);
 
+    List<CustomerRankListVO> getRanklist(@Param("params") StatisticsDTO statisticsDTo);
 }

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         a.sex,
         "customer" AS type,
         a.building_id AS buildingId,
+        a.create_date,
+        a.building_id,
         a.realty_consultant AS consultant,
         a.STATUS AS customerStatus,
         NULL AS channelStatus,
         b.avatarurl
         from ta_recommend_customer a left join ta_person b on a.person_id = b.person_id
         where a.recommend_person = #{customerId}
-        and a.status >= #{status}
+        <if test="status != null and status !=''">
+            and a.status = #{status}
+        </if>
+        <if test="startDate != null or endDate != null">
+            AND a.create_date BETWEEN #{startDate} and #{endDate}
+        </if>
         and a.org_id = #{orgId}
         <if test="personBuildingList != null and personBuildingList.size > 0">
             AND a.building_id in
                 #{personBuilding.buildingId}
             </foreach>
         </if>
+        ORDER BY create_date
         union all
         SELECT
         a.channel_customer_id AS id,
         a.phone,
         a.picture,
         a.sex,
+        a.building_id,
         "report" AS type,
         NULL AS buildingId,
+        a.create_date,
         NULL AS consultant,
-        NULL AS customerStatus,
+        "1" AS customerStatus,
         a.STATUS AS channelStatus,
         b.avatarurl
         FROM
         xlk_channel_customer a
         LEFT JOIN ta_person b ON a.person_id = b.person_id
         where a.recommend_person = #{customerId}
-        and a.status = #{status}
+        and a.status = 1
+        <if test="status != null and status !=''">
+            and a.status = #{status}
+        </if>
+        <if test="startDate != null or endDate != null">
+            AND a.create_date BETWEEN #{startDate} and #{endDate}
+        </if>
         and a.org_id = #{orgId}
         <if test="personBuildingList != null and personBuildingList.size > 0">
             AND a.building_id in
                 #{personBuilding.buildingId}
             </foreach>
         </if>
+        ORDER BY create_date
     </select>
 
     <select id="getCustomerListOfConsultant" resultType="com.yunzhi.marketing.entity.TaRecommendCustomer">

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

             ORDER BY
                 t.create_date DESC
     </select>
+    <select id="getRanklist" resultType="com.yunzhi.marketing.po.CustomerRankListVO">
+        SELECT
+            COUNT(1) as number,
+            t.recommend_person,
+            p.`name`
+        FROM
+            xlk_channel_customer t
+        LEFT JOIN ta_person p on t.recommend_person = p.person_id
+        WHERE t.channel_id  = #{params.channelId}
+        and `status` = 2
+        <if test="params.startDate != null or params.endDate != null">
+            AND t.create_date BETWEEN #{params.startDate} and #{params.endDate}
+        </if>
+        <if test="params.startDate == null or params.endDate == null">
+            AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+        </if>
+        GROUP BY t.recommend_person
+        ORDER BY number desc
+        LIMIT 3
+    </select>
 </mapper>