Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -64,7 +64,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Autowired
     private TdCityMapper cityMapper;
-    
+
     @Autowired
     private TaCustomerFollowUpRecordMapper customerFollowUpRecordMapper;
 
@@ -211,7 +211,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public synchronized ResponseBean recommendCust(String paramStr, String openid,Integer orgId) {
+    public synchronized ResponseBean recommendCust(String paramStr, String openid, Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -227,8 +227,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
         }
 
-        TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+        // 报备有 10 天有效期
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone", params.getString("phone"));
+        queryWrapper.eq("building_id", params.getString("intention"));
+        queryWrapper.in("verify_status", CommConstant.VERIFY_AGREE, CommConstant.VERIFY_READY);
+        List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
+        if (null != result && result.size() > 0) {
+            return ResponseBean.error("当前客户已被推荐, 不能再次推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
+        TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
         taRecommendCustomer.setName(params.getString("name"));
         taRecommendCustomer.setPicture(params.getString("picture"));
         taRecommendCustomer.setPhone(params.getString("phone"));
@@ -242,11 +251,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
         taRecommendCustomer.setOrgId(orgId);
-       QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
-       personQueryWrapper.eq("org_id",orgId);
-       personQueryWrapper.eq("phone",params.getString("phone"));
+        QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
+        personQueryWrapper.eq("org_id", orgId);
+        personQueryWrapper.eq("phone", params.getString("phone"));
         TaPerson currentPerson = taPersonMapper.selectOne(personQueryWrapper);
-        if(null != currentPerson){
+        if (null != currentPerson) {
             taRecommendCustomer.setPersonId(currentPerson.getPersonId());
         }
 
@@ -271,24 +280,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
         String status = params.getString("status");
         int statusInt = 0;
-        if (StringUtils.isEmpty(status)){
+        if (StringUtils.isEmpty(status)) {
             taRecommendCustomer.setStatus(statusInt);
-        }else{
+        } else {
             taRecommendCustomer.setStatus(Integer.parseInt(status));
         }
 
         taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
 
-        // 报备有 10 天有效期
-        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone", taRecommendCustomer.getPhone());
-        queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
-        queryWrapper.in("verify_status",CommConstant.VERIFY_AGREE,CommConstant.VERIFY_READY);
-        List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
-        if (null != result && result.size() > 0) {
-            return ResponseBean.error("当前客户已被推荐, 不能再次推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
         if (row < 1) {
             return ResponseBean.error("推荐客户失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -305,9 +304,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
 
-
     @Override
-    public ResponseBean reportCust(String paramStr, String openid,Integer orgId) {
+    public ResponseBean reportCust(String paramStr, String openid, Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -361,12 +359,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRealtyConsultant(consultantUser.getUserId().toString());
         //如果没有传building_id的情况构造building_id
-        if (StringUtils.isEmpty(params.getString("buildingId")) && !StringUtils.isEmpty(params.getString("realtyConsultant"))){
+        if (StringUtils.isEmpty(params.getString("buildingId")) && !StringUtils.isEmpty(params.getString("realtyConsultant"))) {
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
             taPersonBuildingQueryWrapper.eq("person_id", consultantPerson.getPersonId()).or().eq("user_id", consultantUser.getUserId());
             List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingMapper.selectList(taPersonBuildingQueryWrapper);
-            if (taPersonBuildingList.size() > 0){
-                params.put("buildingId",taPersonBuildingList.get(0).getBuildingId());
+            if (taPersonBuildingList.size() > 0) {
+                params.put("buildingId", taPersonBuildingList.get(0).getBuildingId());
             }
         }
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
@@ -393,11 +391,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
         QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
-        personQueryWrapper.eq("org_id",orgId);
-        personQueryWrapper.eq("phone",params.getString("phone"));
+        personQueryWrapper.eq("org_id", orgId);
+        personQueryWrapper.eq("phone", params.getString("phone"));
         TaPerson currentPerson = taPersonMapper.selectOne(personQueryWrapper);
-        if(null != currentPerson){
-            if (currentPerson.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
+        if (null != currentPerson) {
+            if (currentPerson.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)) {
                 return ResponseBean.error("置业顾问不可以绑定置业顾问", ResponseBean.ERROR_ILLEGAL_PARAMS);
             }
             taRecommendCustomer.setPersonId(currentPerson.getPersonId());
@@ -413,29 +411,29 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         // 报备有 10 天有效期
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
-        queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
+        queryWrapper.eq("building_id", taRecommendCustomer.getBuildingId());
         queryWrapper.eq("org_id", taRecommendCustomer.getOrgId());
-        queryWrapper.in("verify_status",CommConstant.VERIFY_AGREE,CommConstant.VERIFY_READY);
+        queryWrapper.in("verify_status", CommConstant.VERIFY_AGREE, CommConstant.VERIFY_READY);
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
         if (null != result && result.size() > 0) {
             String conName = "";
             TaPerson conPerson = taPersonMapper.selectById(result.get(0).getRealtyConsultant());
-            if (null != conPerson){
-                if(null != consultantPerson && consultantPerson.getPersonId().equals(conPerson.getPersonId())){
-                   return  ResponseBean.success("bound");
+            if (null != conPerson) {
+                if (null != consultantPerson && consultantPerson.getPersonId().equals(conPerson.getPersonId())) {
+                    return ResponseBean.success("bound");
                 }
                 conName = conPerson.getName();
-            }else {
+            } else {
                 TaUser conUser = userService.getById(result.get(0).getRealtyConsultant());
-                if(null != conUser){
-                    if(consultantUser.getUserId().equals(conUser.getUserId())){
+                if (null != conUser) {
+                    if (consultantUser.getUserId().equals(conUser.getUserId())) {
                         return ResponseBean.success("bound");
                     }
                     conName = conUser.getUserName();
 
                 }
             }
-            return ResponseBean.error("您在当前项目的置业顾问是:"+conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error("您在当前项目的置业顾问是:" + conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
@@ -471,106 +469,104 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
 
-
-
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize,String building,String personId){
-        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+    public IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building, String personId) {
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
 //        queryWrapper.eq("building_id",building);
-        queryWrapper.eq("realty_consultant",personId);
+        queryWrapper.eq("realty_consultant", personId);
         queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+        IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
+        return taRecommendCustomerMapper.selectPage(page, queryWrapper);
     }
 
     @Override
-    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType, String startCreateDate, String endCreateDate){
+    public IPage getCustomerList(Integer status, int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, String customerType, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, String sceneType, String startCreateDate, String endCreateDate) {
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
-            IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
+            IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
             // 公客就不用 buildingId 进行查询
-            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType, taPersonBuildingList,building, startCreateDate, endCreateDate);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, taPersonBuildingList, building, startCreateDate, endCreateDate);
         } else {
             // 私客
-            IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList,sceneType, startCreateDate, endCreateDate);
+            IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, taPersonBuildingList, sceneType, startCreateDate, endCreateDate);
         }
 
     }
 
     @Override
-    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId){
-        IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel, orgId);
+    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, Integer orgId) {
+        IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
+        return taRecommendCustomerMapper.getIndependentAgents(page, name, tel, orgId);
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getRecCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId,taPersonBuildingList);
+    public IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+        IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
+        return taRecommendCustomerMapper.getRecCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, taPersonBuildingList);
     }
 
 
     @Override
-    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId,taPersonBuildingList);
+    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+        IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
+        return taRecommendCustomerMapper.getRepCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, taPersonBuildingList);
     }
 
     @Override
-    public TaRecommendCustomer getCustomerById(String customerId){
+    public TaRecommendCustomer getCustomerById(String customerId) {
         return taRecommendCustomerMapper.getCustomerById(customerId);
     }
 
 
     @Override
-    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
+    public TaRecommendCustomer getCustomerDetail(String customerId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId) {
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
-        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId, personId);
         TaPerson person = taPersonMapper.selectById(personId);
-        if(!StringUtils.isEmpty(personId)){
-            IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
+        if (!StringUtils.isEmpty(personId)) {
+            IPage<TaPersonVisitRecord> page = new Page<>(pageNumber, pageSize);
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page, personId, taPersonBuildingList, buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
                 //获取活动标题
-                if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("activity".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
-                    if (null != taBuildingDynamic){
+                    if (null != taBuildingDynamic) {
                         e.setActivityName(taBuildingDynamic.getTitle());
                     }
 
                 }
                 //获取拼团标题
-                if ("group".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("group".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
-                    if (null != taShareActivity){
+                    if (null != taShareActivity) {
                         e.setActivityName(taShareActivity.getActivityName());
                     }
                 }
                 //获取助力标题
-                if ("help".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("help".equals(e.getEventType()) && null != e.getTargetId()) {
                     HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
-                    if (null != helpActivity){
+                    if (null != helpActivity) {
                         e.setActivityName(helpActivity.getTitle());
                     }
                 }
                 //获取咨询标题
-                if ("news".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("news".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaNews taNews = taNewsMapper.selectById(e.getTargetId());
-                    if (null != taNews){
+                    if (null != taNews) {
                         e.setActivityName(taNews.getNewsName());
                     }
                 }
                 //获取H5活动标题
-                if ("h5".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("h5".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
-                    if (null != taDrainage){
+                    if (null != taDrainage) {
                         e.setActivityName(taDrainage.getName());
                     }
                 }
@@ -578,19 +574,19 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taPersonVisitRecordIPage.setRecords(records);
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId, taPersonBuildingList));
         }
-        if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
-            TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
+        if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
+            TaPerson consultant = taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
             TaUser user = new TaUser();
-            if(null == consultant){
+            if (null == consultant) {
                 user = userService.getById(taRecommendCustomer.getRealtyConsultant());
-            }else {
+            } else {
                 user = userService.getById(consultant.getUserId());
             }
-            if (null != user){
+            if (null != user) {
                 List<String> projects = taPersonMapper.getUserProjects(user.getUserId());
-                if (projects.size()>0){
+                if (projects.size() > 0) {
                     user.setProjects(projects);
                 }
                 taRecommendCustomer.setConsultant(user);
@@ -598,26 +594,26 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
         //构造来源类型
         taRecommendCustomer.setPersonFrom("");
-        if (null != person){
-            Map<String,String>geoInfo = new HashMap<>();
-            geoInfo.put("provience",person.getProvince());
-            geoInfo.put("country",person.getCountry());
+        if (null != person) {
+            Map<String, String> geoInfo = new HashMap<>();
+            geoInfo.put("provience", person.getProvince());
+            geoInfo.put("country", person.getCountry());
             TdCity city = cityMapper.selectById(person.getCity());
-            if(null!=city){
-                geoInfo.put("city",city.getName());
-            }else {
-                geoInfo.put("city","未知");
+            if (null != city) {
+                geoInfo.put("city", city.getName());
+            } else {
+                geoInfo.put("city", "未知");
             }
             taRecommendCustomer.setGeoInfo(geoInfo);
 
             QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",person.getOrgId());
-            queryWrapper.eq("person_id",person.getPersonId());
-            queryWrapper.eq("is_first_time",1);
+            queryWrapper.eq("org_id", person.getOrgId());
+            queryWrapper.eq("person_id", person.getPersonId());
+            queryWrapper.eq("is_first_time", 1);
             List<TaPersonFromRecord> taPersonFromRecords = taPersonFromRecordMapper.selectList(queryWrapper);
-            if (taPersonFromRecords.size() > 0){
+            if (taPersonFromRecords.size() > 0) {
                 QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
-                tdWxDictQueryWrapper.eq("scene_id",taPersonFromRecords.get(0).getSceneId());
+                tdWxDictQueryWrapper.eq("scene_id", taPersonFromRecords.get(0).getSceneId());
                 TdWxDict tdWxDict = tdWxDictMapper.selectOne(tdWxDictQueryWrapper);
                 taRecommendCustomer.setPersonFrom(null != tdWxDict ? tdWxDict.getSceneAlias() : "");
             }
@@ -627,46 +623,46 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
+    public TaPerson getPublicCustomerDetail(String personId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId) {
         TaPerson taPerson = taPersonMapper.getById(personId);
-        if(!StringUtils.isEmpty(personId)){
-            IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
+        if (!StringUtils.isEmpty(personId)) {
+            IPage<TaPersonVisitRecord> page = new Page<>(pageNumber, pageSize);
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page, personId, taPersonBuildingList, buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
                 //获取活动标题
-                if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("activity".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
-                    if (null != taBuildingDynamic){
+                    if (null != taBuildingDynamic) {
                         e.setActivityName(taBuildingDynamic.getTitle());
                     }
 
                 }
                 //获取拼团标题
-                if ("group".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("group".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
-                    if (null != taShareActivity){
+                    if (null != taShareActivity) {
                         e.setActivityName(taShareActivity.getActivityName());
                     }
                 }
                 //获取助力标题
-                if ("help".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("help".equals(e.getEventType()) && null != e.getTargetId()) {
                     HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
-                    if (null != helpActivity){
+                    if (null != helpActivity) {
                         e.setActivityName(helpActivity.getTitle());
                     }
                 }
                 //获取咨询标题
-                if ("news".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("news".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaNews taNews = taNewsMapper.selectById(e.getTargetId());
-                    if (null != taNews){
+                    if (null != taNews) {
                         e.setActivityName(taNews.getNewsName());
                     }
                 }
                 //获取H5活动标题
-                if ("h5".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("h5".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
-                    if (null != taDrainage){
+                    if (null != taDrainage) {
                         e.setActivityName(taDrainage.getName());
                     }
                 }
@@ -674,25 +670,25 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taPersonVisitRecordIPage.setRecords(records);
             taPerson.setVisitRecords(taPersonVisitRecordIPage);
             taPerson.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taPerson.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
+            taPerson.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId, taPersonBuildingList));
             taPerson.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
             taPerson.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
             TdCity city = cityMapper.selectById(taPerson.getCity());
-            if(null != city){
+            if (null != city) {
                 taPerson.setCity(city.getName());
             }
 
             //构造来源类型
             taPerson.setPersonFrom("");
-            if (null != taPerson){
+            if (null != taPerson) {
                 QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("org_id",taPerson.getOrgId());
-                queryWrapper.eq("person_id",taPerson.getPersonId());
-                queryWrapper.eq("is_first_time",1);
+                queryWrapper.eq("org_id", taPerson.getOrgId());
+                queryWrapper.eq("person_id", taPerson.getPersonId());
+                queryWrapper.eq("is_first_time", 1);
                 List<TaPersonFromRecord> taPersonFromRecords = taPersonFromRecordMapper.selectList(queryWrapper);
-                if (taPersonFromRecords.size() > 0){
+                if (taPersonFromRecords.size() > 0) {
                     QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
-                    tdWxDictQueryWrapper.eq("scene_id",taPersonFromRecords.get(0).getSceneId());
+                    tdWxDictQueryWrapper.eq("scene_id", taPersonFromRecords.get(0).getSceneId());
                     TdWxDict tdWxDict = tdWxDictMapper.selectOne(tdWxDictQueryWrapper);
                     taPerson.setPersonFrom(null != tdWxDict ? tdWxDict.getSceneAlias() : "");
                 }
@@ -702,17 +698,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
+    public IPage<TaRecommendCustomer> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
 
-        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         // todo
         // 此处可能不是 person_id 而是 recommend_person
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+        IPage<TaRecommendCustomer> 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);
+        return taRecommendCustomerMapper.getCustomersIRecommended(page, customerId, CommConstant.STATUS_NORMAL, orgId, taPersonBuildingList);
     }
 
     @Override
@@ -754,8 +750,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId) {
-        if (CollectionUtils.isNotEmpty(taUser.getPersonIds())){
-            for (TaPerson taPerson : taUser.getPersonIds()){
+        if (CollectionUtils.isNotEmpty(taUser.getPersonIds())) {
+            for (TaPerson taPerson : taUser.getPersonIds()) {
                 consultantAssist(taUser, taPerson.getPersonId(), orgId);
             }
         }
@@ -834,24 +830,24 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList) {
-        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize,taPersonBuildingList);
+    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize, List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize, taPersonBuildingList);
     }
 
     @Override
-    public Integer getRecCustomerExportCount(Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
-        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId,taPersonBuildingList);
+    public Integer getRecCustomerExportCount(Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId, taPersonBuildingList);
     }
 
 
     @Override
-    public Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex,Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
-        return taRecommendCustomerMapper.getRepCustomerReportCount(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,taPersonBuildingList);
+    public Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRepCustomerReportCount(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, taPersonBuildingList);
     }
 
     @Override
-    public List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList) {
-        return taRecommendCustomerMapper.getRepCustomerReportExport(building, name, tel, consultName, consultTel, entryType,verifyStatus,sex, orgId, pageCode, pageSize,taPersonBuildingList);
+    public List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize, List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRepCustomerReportExport(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, pageCode, pageSize, taPersonBuildingList);
     }
 
 
@@ -864,7 +860,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     public List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize) {
         return taRecommendCustomerMapper.getIndependentAgentsExport(orgId, pageCode, pageSize);
     }
-    
+
     /**
      * 查询我的客户人数集合
      *
@@ -877,12 +873,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-    
+
         TaPerson taPerson = taPersons.get(0);
-        Map<String,Object> map = taRecommendCustomerMapper.getMyCustStatistics(taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId());
+        Map<String, Object> map = taRecommendCustomerMapper.getMyCustStatistics(taPerson.getPersonId(), taPerson.getUserId(), taPerson.getOrgId());
         return ResponseBean.success(map);
     }
-    
+
     /**
      * 分页查询我的跟进客户集合
      *
@@ -904,18 +900,18 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-    
+
         TaPerson taPerson = taPersons.get(0);
-        
+
         IPage<TaRecommendCustomer> page = new Page<>();
         page.setCurrent(pageNumber);
         page.setSize(pageSize);
-        
+
         //分页获取跟进客户status != 4的为跟进客户， status = 4的为成交客户 根据type区分  follow 跟进  clinch 成交
-        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.getMyCustFollowOrClinch(page, taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId(), type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);
+        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.getMyCustFollowOrClinch(page, taPerson.getPersonId(), taPerson.getUserId(), taPerson.getOrgId(), type, name, phone, status, startReportDate, endReportDate, startArrivalDate, endArrivalDate);
         return ResponseBean.success(result);
     }
-    
+
     /**
      * 获取盘客工具下我的客户详情
      *
@@ -929,14 +925,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-    
+
         TaPerson taPerson = taPersons.get(0);
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getMyCustDetailById(customerId);
         //添加跟进行为
-        addCustomerFpllowUp(taPerson,taRecommendCustomer,"查看客户详情");
+        addCustomerFpllowUp(taPerson, taRecommendCustomer, "查看客户详情");
         return ResponseBean.success(taRecommendCustomer);
     }
-    
+
     /**
      * 更新我的客户基本信息
      *
@@ -950,16 +946,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-    
+
         TaPerson taPerson = taPersons.get(0);
         taRecommendCustomerMapper.updateById(taRecommendCustomer);
         //添加跟进行为
-        addCustomerFpllowUp(taPerson,taRecommendCustomer,"编辑客户信息");
+        addCustomerFpllowUp(taPerson, taRecommendCustomer, "编辑客户信息");
         return ResponseBean.success(taRecommendCustomer);
     }
-    
+
     //添加跟进行为
-    private void addCustomerFpllowUp(TaPerson taPerson,TaRecommendCustomer taRecommendCustomer,String recordType) {
+    private void addCustomerFpllowUp(TaPerson taPerson, TaRecommendCustomer taRecommendCustomer, String recordType) {
         TaCustomerFollowUpRecord taCustomerFollowUpRecord = new TaCustomerFollowUpRecord();
         taCustomerFollowUpRecord.setOrgId(taPerson.getOrgId());
         taCustomerFollowUpRecord.setCreateDate(LocalDateTime.now());

src/main/resources/mapper/ActivityManageMapper.xml

@@ -35,14 +35,7 @@
         -- 活动访问人数
         (select count( DISTINCT d.person_id ) from ta_person_visit_record d
         WHERE d.org_id = a.org_id
-            <choose>
-                <when test=" type == 'live'">
-                    AND d.target_type like concat('%',REPLACE(a.target_type, 'activity', 'dynamic'),'%')
-                </when>
-                <otherwise>
-                    AND d.target_type = REPLACE(a.target_type, 'activity', 'dynamic')
-                </otherwise>
-            </choose>
+            AND (d.target_type = a.target_type OR d.event_type = a.target_type)
             AND d.target_id = a.target_id
             AND d.`event` = 'detail'
         ) as visit_persons,
@@ -50,14 +43,7 @@
         -- 活动访问次数
         (select count(*) from ta_person_visit_record e
         WHERE e.org_id = a.org_id
-            <choose>
-                <when test=" type == 'live'">
-                    AND e.target_type like concat('%',REPLACE(a.target_type, 'activity', 'dynamic'),'%')
-                </when>
-                <otherwise>
-                    AND e.target_type = REPLACE(a.target_type, 'activity', 'dynamic')
-                </otherwise>
-            </choose>
+            AND (e.target_type = a.target_type OR e.event_type = a.target_type)
             AND e.target_id = a.target_id
             AND e.`event` = 'detail'
         ) as visit_num,

src/main/resources/mapper/TaBuildingMapper.xml

@@ -525,7 +525,7 @@
         b.STATUS > 0
         AND b.org_id = #{orgId}
         AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
-        AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+        AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id IS NOT NULL AND person_id != '' )
         <if test="startDate != null">
             and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
         </if>
@@ -544,8 +544,10 @@
         u.be_uv AS building_id
         FROM
         ta_uv u
+        LEFT JOIN ta_person p ON u.person_id = p.person_id
         WHERE
         u.tagert_type = 'project'
+        AND p.org_id = #{orgId}
         <if test="startDate != null">
             and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
         </if>