需求

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

@@ -394,6 +394,20 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
+    /**
+     * 分配置业顾问
+     */
+    @RequestMapping(value="/admin/customer/consultant/assist/{personId}",method= RequestMethod.POST)
+    public ResponseBean assistConsultant (@RequestBody TaUser taUser, @PathVariable String personId, HttpServletRequest request){
+        try{
+            Integer orgId = getOrgId(request);
+            taRecommendCustomerService.consultantAssist(taUser, personId, orgId);
+            return ResponseBean.success("");
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
 
     @GetMapping("/admin/customer/recommend/{customerId}")
     public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId,HttpServletRequest request){

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
@@ -9,8 +10,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import io.swagger.models.auth.In;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -54,6 +55,8 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer newByPerson(TaPerson person);
 
+    ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId);
+
     /**
      * 导出数据(推荐客户)
      * @param orgId

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

@@ -330,20 +330,20 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @Override
     public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
-        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId,startDate,endDate);
+//        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId,startDate,endDate);
         QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
         tdWxDictQueryWrapper.groupBy("scene_type");
         List<TdWxDict> tdWxDicts = tdWxDictMapper.selectList(tdWxDictQueryWrapper);
-        tdWxDicts.forEach(e -> {
-            int fromSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getFromNum).sum();
-            int registerSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getRegisteredNum).sum();
-            e.setFromData(fromSum);
-            e.setRegisterSum(registerSum);
-        });
+//        tdWxDicts.forEach(e -> {
+//            int fromSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getFromNum).sum();
+//            int registerSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getRegisteredNum).sum();
+//            e.setFromData(fromSum);
+//            e.setRegisterSum(registerSum);
+//        });
         Map<String,Object> map = new HashMap<>();
         map.put("tdWxDicts",tdWxDicts);
-        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId,startDate,endDate);
-        map.put("list",tableList);
+//        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId,startDate,endDate);
+//        map.put("list",tableList);
         responseBean.addSuccess(map);
         return responseBean;
     }

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

@@ -750,6 +750,55 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
     }
 
+    @Override
+    public ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId) {
+        TaPerson taPerson = taPersonMapper.getById(personId);
+
+        QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper();
+        taPersonQueryWrapper.eq("user_id", taUser.getUserId());
+        TaPerson recommendPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+
+        QueryWrapper<TaUser> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("user_id", taUser.getUserId());
+        TaUser userInfo = taUserMapper.selectOne(queryWrapper);
+
+        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper();
+        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+        TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(taPersonBuildingQueryWrapper);
+
+        if (null == userInfo || userInfo.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("置业顾问不存在或已被注销", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+        taRecommendCustomer.setOrgId(orgId);
+        taRecommendCustomer.setName(taPerson.getNickname());
+        taRecommendCustomer.setPicture(taPerson.getAvatarurl());
+        taRecommendCustomer.setPhone(taPerson.getPhone());
+        taRecommendCustomer.setSex(null == taPerson.getGender() ? null : ("1".equals(taPerson.getGender()) ? 1 : 2));
+        taRecommendCustomer.setRealtyConsultant(userInfo.getUserId().toString());
+        taRecommendCustomer.setBuildingId(taPersonBuilding.getBuildingId());
+        TaBuilding building = taBuildingMapper.selectById(taPersonBuilding.getBuildingId());
+        taRecommendCustomer.setIntention(building.getBuildingName());
+        taRecommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
+        taRecommendCustomer.setCreateDate(LocalDateTime.now());
+        taRecommendCustomer.setReportDate(LocalDateTime.now());
+        taRecommendCustomer.setPersonId(taPerson.getPersonId());
+        taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
+        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+        taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
+        taRecommendCustomer.setPersonId(personId);
+        taRecommendCustomer.setRecommendPerson(recommendPerson == null ? taUser.getUserId().toString() : recommendPerson.getPersonId());
+
+        int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
+        if (row < 1) {
+            return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success(taRecommendCustomer);
+
+    }
+
     private List<TaRecommendCustomer> getCustomerByPhone(String phone) {
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", phone);