傅行帆 5 gadus atpakaļ
vecāks
revīzija
5cc5efe739

+ 5
- 9
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Parādīt failu

7
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
7
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
8
 import com.baomidou.mybatisplus.core.metadata.IPage;
8
 import com.baomidou.mybatisplus.core.metadata.IPage;
9
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
10
-import com.fasterxml.jackson.annotation.JsonFormat;
10
+import com.huiju.estateagents.base.BaseController;
11
 import com.huiju.estateagents.base.ResponseBean;
11
 import com.huiju.estateagents.base.ResponseBean;
12
 import com.huiju.estateagents.center.taUser.entity.TaUser;
12
 import com.huiju.estateagents.center.taUser.entity.TaUser;
13
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
13
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
14
 import com.huiju.estateagents.common.CommConstant;
14
 import com.huiju.estateagents.common.CommConstant;
15
-import com.huiju.estateagents.common.JWTUtils;
16
 import com.huiju.estateagents.common.StringUtils;
15
 import com.huiju.estateagents.common.StringUtils;
17
-import com.huiju.estateagents.entity.*;
16
+import com.huiju.estateagents.entity.TaBuilding;
17
+import com.huiju.estateagents.entity.TaPerson;
18
+import com.huiju.estateagents.entity.TaRecommendCustomer;
18
 import com.huiju.estateagents.event.EventBus;
19
 import com.huiju.estateagents.event.EventBus;
19
 import com.huiju.estateagents.excel.*;
20
 import com.huiju.estateagents.excel.*;
20
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
21
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
29
 import io.swagger.annotations.ApiImplicitParams;
30
 import io.swagger.annotations.ApiImplicitParams;
30
 import io.swagger.annotations.ApiOperation;
31
 import io.swagger.annotations.ApiOperation;
31
 import org.apache.commons.collections.CollectionUtils;
32
 import org.apache.commons.collections.CollectionUtils;
32
-import org.apache.poi.ss.formula.functions.T;
33
 import org.springframework.beans.factory.annotation.Autowired;
33
 import org.springframework.beans.factory.annotation.Autowired;
34
 import org.springframework.context.ApplicationContext;
34
 import org.springframework.context.ApplicationContext;
35
-import org.springframework.format.annotation.DateTimeFormat;
36
 import org.springframework.web.bind.annotation.*;
35
 import org.springframework.web.bind.annotation.*;
37
 
36
 
38
-import com.huiju.estateagents.base.BaseController;
39
-
40
 import javax.annotation.Resource;
37
 import javax.annotation.Resource;
41
 import javax.servlet.http.HttpServletRequest;
38
 import javax.servlet.http.HttpServletRequest;
42
 import javax.servlet.http.HttpServletResponse;
39
 import javax.servlet.http.HttpServletResponse;
43
 import java.io.IOException;
40
 import java.io.IOException;
44
 import java.time.LocalDateTime;
41
 import java.time.LocalDateTime;
45
-import java.util.ArrayList;
46
 import java.util.List;
42
 import java.util.List;
47
-import java.util.Map;
48
 
43
 
49
 /**
44
 /**
50
  * <p>
45
  * <p>
640
                     if (null != realtyConsultant) {
635
                     if (null != realtyConsultant) {
641
                         List<TaBuilding> taBuildings = taPersonBuildingMapper.getBuildingsOf(realtyConsultant);
636
                         List<TaBuilding> taBuildings = taPersonBuildingMapper.getBuildingsOf(realtyConsultant);
642
                         taRecommendCustomer.setRealtyConsultant(realtyConsultant);
637
                         taRecommendCustomer.setRealtyConsultant(realtyConsultant);
638
+                        taRecommendCustomer.setCreateDate(LocalDateTime.now());
643
                         if (taBuildings != null && taBuildings.size() > 0) {
639
                         if (taBuildings != null && taBuildings.size() > 0) {
644
                             TaBuilding taBuilding = taBuildings.get(0);
640
                             TaBuilding taBuilding = taBuildings.get(0);
645
                             taRecommendCustomer.setBuildingId(taBuilding.getBuildingId());
641
                             taRecommendCustomer.setBuildingId(taBuilding.getBuildingId());

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java Parādīt failu

197
                                                            @Param("userId") String userId,
197
                                                            @Param("userId") String userId,
198
                                                            @Param("buildingId") String buildingId,
198
                                                            @Param("buildingId") String buildingId,
199
                                                            @Param("startDate") LocalDateTime startDate,
199
                                                            @Param("startDate") LocalDateTime startDate,
200
-                                                           @Param("endDate") LocalDateTime endDate);
200
+                                                           @Param("endDate") LocalDateTime endDate,
201
+                                                           @Param("personId") String personId);
201
 }
202
 }

+ 7
- 1
src/main/java/com/huiju/estateagents/service/impl/TsConsultantKpiServiceImpl.java Parādīt failu

1
 package com.huiju.estateagents.service.impl;
1
 package com.huiju.estateagents.service.impl;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.huiju.estateagents.center.taUser.entity.TaUser;
6
 import com.huiju.estateagents.center.taUser.entity.TaUser;
7
 import com.huiju.estateagents.common.StringUtils;
8
 import com.huiju.estateagents.common.StringUtils;
8
 import com.huiju.estateagents.entity.*;
9
 import com.huiju.estateagents.entity.*;
9
 import com.huiju.estateagents.excel.ConsultantKPIExport;
10
 import com.huiju.estateagents.excel.ConsultantKPIExport;
11
+import com.huiju.estateagents.mapper.TaPersonMapper;
10
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
12
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
11
 import com.huiju.estateagents.mapper.TsConsultantKpiMapper;
13
 import com.huiju.estateagents.mapper.TsConsultantKpiMapper;
12
 import com.huiju.estateagents.service.ITsConsultantKpiService;
14
 import com.huiju.estateagents.service.ITsConsultantKpiService;
36
 
38
 
37
     @Autowired
39
     @Autowired
38
     TaRecommendCustomerMapper taRecommendCustomerMapper;
40
     TaRecommendCustomerMapper taRecommendCustomerMapper;
41
+    
42
+    @Autowired
43
+    private TaPersonMapper taPersonMapper;
39
 
44
 
40
     /**
45
     /**
41
      * 获取用户授权楼盘
46
      * 获取用户授权楼盘
101
 
106
 
102
     @Override
107
     @Override
103
     public IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
108
     public IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
104
-        return taRecommendCustomerMapper.getCustomerListOfConsultant(page, orgId, userId, buildingId, startDate, endDate);
109
+        TaPerson taPerson = taPersonMapper.selectOne(new QueryWrapper<TaPerson>().eq("user_id", userId).eq("org_id", orgId));
110
+        return taRecommendCustomerMapper.getCustomerListOfConsultant(page, orgId, userId, buildingId, startDate, endDate, taPerson.getPersonId());
105
     }
111
     }
106
 
112
 
107
     @Override
113
     @Override

+ 1
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml Parādīt failu

842
         from ta_recommend_customer s
842
         from ta_recommend_customer s
843
         left join ta_person t on t.person_id = s.person_id
843
         left join ta_person t on t.person_id = s.person_id
844
         where s.org_id = #{orgId}
844
         where s.org_id = #{orgId}
845
-        and s.realty_consultant = #{userId}
845
+        and (s.realty_consultant = #{userId} or s.realty_consultant = #{personId})
846
         <if test="startDate != null">
846
         <if test="startDate != null">
847
             and s.create_date BETWEEN #{startDate} and #{endDate}
847
             and s.create_date BETWEEN #{startDate} and #{endDate}
848
         </if>
848
         </if>