调整

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

@@ -548,11 +548,12 @@ public class TaRecommendCustomerController extends BaseController {
 
     @GetMapping("/admin/customer/recommend/drift")
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
-                                              @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
+                                              @RequestParam(value ="buildingId",defaultValue = "") String buildingId,
+                                              @RequestParam(value ="sceneType",defaultValue = "") String sceneType,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
-            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId, getOrgId(request)));
+            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId, getOrgId(request),sceneType));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TdReport;
 import com.huiju.estateagents.service.ITdReportService;
 import io.swagger.annotations.Api;
@@ -60,6 +61,7 @@ public class TdReportController extends BaseController {
             //使用分页插件
 		    IPage<TdReport> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdReport> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TdReport> result = iTdReportService.page(pg, queryWrapper);

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TdWxDict;
+import com.huiju.estateagents.service.ITdWxDictService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 微信字典表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@RestController
+@RequestMapping("/api")
+public class TdWxDictController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdWxDictController.class);
+
+    @Autowired
+    public ITdWxDictService iTdWxDictService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/tdWxDict",method= RequestMethod.GET)
+    public ResponseBean tdWxDictList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TdWxDict> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TdWxDict> queryWrapper = new QueryWrapper<>();
+            queryWrapper.groupBy("scene_type");
+
+            IPage<TdWxDict> result = iTdWxDictService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdWxDict 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdWxDict",method= RequestMethod.POST)
+    public ResponseBean tdWxDictAdd(@RequestBody TdWxDict tdWxDict){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdWxDictService.save(tdWxDict)){
+                responseBean.addSuccess(tdWxDict);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdWxDict/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdWxDictDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdWxDictService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdWxDict 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdWxDict/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdWxDictUpdate(@PathVariable Integer id,
+                                        @RequestBody TdWxDict tdWxDict){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdWxDictService.updateById(tdWxDict)){
+                responseBean.addSuccess(tdWxDict);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdWxDict/{id}",method= RequestMethod.GET)
+    public ResponseBean tdWxDictGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdWxDictService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -287,4 +287,10 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String personFrom;
+
+    /**
+     * 用户来源
+     */
+    @TableField(exist = false)
+    private String sceneAlias;
 }

src/main/java/com/huiju/estateagents/entity/TdWxDict.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 微信字典表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdWxDict implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 场景值id
+     */
+    private String sceneId;
+
+    /**
+     * 场景名称
+     */
+    private String sceneName;
+
+    /**
+     * 场景类型
+     */
+    private String sceneType;
+
+    /**
+     * 场景类型别名
+     */
+    private String sceneAlias;
+
+
+}

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

@@ -203,4 +203,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     Integer judgeBindStatusByCondition(@Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("phone") String phone);
+
+    IPage<TaPerson> selectDriftCustomerPageList(IPage<TaPerson> page,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId,@Param("personEstateDrift") String personEstateDrift,@Param("sceneType") String sceneType);
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdWxDict;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 微信字典表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@Mapper
+public interface TdWxDictMapper extends BaseMapper<TdWxDict> {
+
+}

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

@@ -57,7 +57,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     List<TaPerson> getPersonsByOpenId(String openid);
 
-    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId);
+    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId, String sceneType);
 
     String getPersonIdByCustomerId(String customerId);
 

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdWxDict;
+
+/**
+ * <p>
+ * 微信字典表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+public interface ITdWxDictService extends IService<TdWxDict> {
+
+}

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

@@ -737,7 +737,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId){
+    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId,String sceneType){
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
         if(building.equals("") && null != building){
@@ -746,7 +746,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.orderByDesc("create_date");
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
-        return taPersonMapper.selectPage(page,queryWrapper);
+        return taPersonMapper.selectDriftCustomerPageList(page,building,orgId,CommConstant.PERSON_ESTATE_DRIFT,sceneType);
     }
 
     @Override

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdWxDict;
+import com.huiju.estateagents.mapper.TdWxDictMapper;
+import com.huiju.estateagents.service.ITdWxDictService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 微信字典表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@Service
+public class TdWxDictServiceImpl extends ServiceImpl<TdWxDictMapper, TdWxDict> implements ITdWxDictService {
+
+}

src/main/resources/mapper/TaPersonMapper.xml

@@ -556,4 +556,23 @@ FROM
         LEFT JOIN ta_person b on a.user_id = b.user_id
         where a.org_id = #{orgId} and b.user_id = #{userId} and a.phone = #{phone} and a.is_consultant = '1'
     </select>
+
+    <select id="selectDriftCustomerPageList" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+            DISTINCT(t.person_id) as id,t.* ,d.scene_type,d.scene_alias
+        FROM
+            ta_person t
+            LEFT JOIN ta_person_from_record r ON t.person_id = r.person_id
+            left join td_wx_dict d on r.scene_id = d.scene_id
+        WHERE
+            t.org_id = #{orgId}
+        and t.person_type = #{personEstateDrift}
+        <if test="buildingId !=null and buildingId !=''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="sceneType !=null and sceneType !=''">
+            and d.scene_type = #{sceneType}
+        </if>
+        order by t.create_date desc
+    </select>
 </mapper>

src/main/resources/mapper/TdWxDictMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TdWxDictMapper">
+
+</mapper>