Просмотр исходного кода

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

张延森 5 лет назад
Родитель
Сommit
e33ff8547d
52 измененных файлов: 765 добавлений и 90 удалений
  1. 1
    0
      pom.xml
  2. 5
    1
      src/main/java/com/huiju/estateagents/controller/ExtendContentController.java
  3. 2
    2
      src/main/java/com/huiju/estateagents/controller/HelpActivityController.java
  4. 1
    1
      src/main/java/com/huiju/estateagents/controller/TaBuildingController.java
  5. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java
  6. 184
    0
      src/main/java/com/huiju/estateagents/controller/TaCustomImgController.java
  7. 5
    0
      src/main/java/com/huiju/estateagents/controller/TaGoodsController.java
  8. 1
    1
      src/main/java/com/huiju/estateagents/controller/TaNewsController.java
  9. 1
    1
      src/main/java/com/huiju/estateagents/controller/TaNewsTypeController.java
  10. 70
    1
      src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java
  11. 1
    1
      src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java
  12. 5
    5
      src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java
  13. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java
  14. 50
    0
      src/main/java/com/huiju/estateagents/entity/TaConsultantInfo.java
  15. 47
    0
      src/main/java/com/huiju/estateagents/entity/TaCustomImg.java
  16. 1
    1
      src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java
  17. 3
    2
      src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java
  18. 4
    2
      src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java
  19. 1
    1
      src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java
  20. 18
    0
      src/main/java/com/huiju/estateagents/mapper/TaCustomImgMapper.java
  21. 10
    1
      src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java
  22. 2
    1
      src/main/java/com/huiju/estateagents/mapper/TaPointsExchangeMapper.java
  23. 4
    3
      src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java
  24. 3
    2
      src/main/java/com/huiju/estateagents/service/IHelpActivityService.java
  25. 3
    2
      src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java
  26. 1
    1
      src/main/java/com/huiju/estateagents/service/ITaBuildingService.java
  27. 16
    0
      src/main/java/com/huiju/estateagents/service/ITaCustomImgService.java
  28. 2
    1
      src/main/java/com/huiju/estateagents/service/ITaNewsService.java
  29. 4
    1
      src/main/java/com/huiju/estateagents/service/ITaNewsTypeService.java
  30. 10
    1
      src/main/java/com/huiju/estateagents/service/ITaPersonVisitRecordService.java
  31. 4
    1
      src/main/java/com/huiju/estateagents/service/ITaPointsExchangeService.java
  32. 5
    4
      src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java
  33. 3
    2
      src/main/java/com/huiju/estateagents/service/ITaShareActivityService.java
  34. 5
    8
      src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java
  35. 4
    4
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java
  36. 3
    2
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java
  37. 43
    0
      src/main/java/com/huiju/estateagents/service/impl/TaCustomImgServiceImpl.java
  38. 4
    5
      src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java
  39. 5
    1
      src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java
  40. 22
    9
      src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java
  41. 3
    2
      src/main/java/com/huiju/estateagents/service/impl/TaPointsExchangeServiceImpl.java
  42. 12
    12
      src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java
  43. 6
    2
      src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java
  44. 6
    2
      src/main/resources/application-prod.yml
  45. 59
    0
      src/main/resources/log/logback-spring.xml
  46. 12
    0
      src/main/resources/mapper/HelpActivityMapper.xml
  47. 12
    0
      src/main/resources/mapper/TaBuildingDynamicMapper.xml
  48. 6
    0
      src/main/resources/mapper/TaBuildingMapper.xml
  49. 5
    0
      src/main/resources/mapper/TaCustomImgMapper.xml
  50. 63
    0
      src/main/resources/mapper/TaPersonVisitRecordMapper.xml
  51. 6
    0
      src/main/resources/mapper/TaPointsExchangeMapper.xml
  52. 18
    0
      src/main/resources/mapper/TaRecommendCustomerMapper.xml

+ 1
- 0
pom.xml Просмотреть файл

@@ -205,6 +205,7 @@
205 205
 					<include>application.yml</include>
206 206
 					<include>application-${profiles.active}.yml</include>
207 207
 					<include>mapper/**/*.xml</include>
208
+					<include>log/*.xml</include>
208 209
 				</includes>
209 210
 			</resource>
210 211
 		</resources>

+ 5
- 1
src/main/java/com/huiju/estateagents/controller/ExtendContentController.java Просмотреть файл

@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest;
33 33
 import java.time.LocalDateTime;
34 34
 import java.util.Collection;
35 35
 import java.util.List;
36
+import java.util.stream.Collectors;
36 37
 
37 38
 /**
38 39
  * <p>
@@ -97,7 +98,9 @@ public class ExtendContentController extends BaseController {
97 98
                                           @RequestParam(value = "showType", required = false) String showType,HttpServletRequest request){
98 99
             ResponseBean responseBean = new ResponseBean();
99 100
             IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
100
-            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
101
+
102
+        List<TaPersonBuilding> taPersonBuildingList = getTaPersonBuildingListByUserId(request);
103
+        QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
101 104
             queryWrapper.eq(cityId != null, "city_id", cityId);
102 105
             queryWrapper.eq(StringUtils.isNotBlank(buildingId), "building_id", buildingId);
103 106
             queryWrapper.eq(StringUtils.isNotBlank(showType), "show_type", showType);
@@ -106,6 +109,7 @@ public class ExtendContentController extends BaseController {
106 109
             queryWrapper.ne("status",9);
107 110
             queryWrapper.eq(status != null, "status", status);
108 111
             queryWrapper.eq( "org_id", getOrgId(request));
112
+            queryWrapper.and(wapper -> wapper.in(taPersonBuildingList.size() > 0,"building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
109 113
             queryWrapper.orderByDesc("create_date");
110 114
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
111 115
 

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/HelpActivityController.java Просмотреть файл

@@ -109,7 +109,7 @@ public class HelpActivityController extends BaseController {
109 109
                                          @RequestParam(value = "activityStatus", required = false) Integer activityStatus,
110 110
                                          HttpServletRequest request) {
111 111
         Integer orgId = getOrgId(request);
112
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
112
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, activityStatus, orgId,getTaPersonBuildingListByUserId(request));
113 113
         return helpActivityList;
114 114
     }
115 115
 
@@ -135,7 +135,7 @@ public class HelpActivityController extends BaseController {
135 135
                                          @RequestParam(value = "name", required = false) String name,
136 136
                                          HttpServletRequest request) {
137 137
         Integer orgId = getOrgId(request);
138
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status,name);
138
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status,name,getTaPersonBuildingListByUserId(request));
139 139
         return helpActivityList;
140 140
     }
141 141
 

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Просмотреть файл

@@ -107,7 +107,7 @@ public class TaBuildingController extends BaseController {
107 107
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
108 108
                                      @RequestParam(value = "isMain",required = false)Integer isMain,
109 109
                                      HttpServletRequest request){
110
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request));
110
+        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request),getTaPersonBuildingListByUserId(request));
111 111
     }
112 112
 
113 113
     /**

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Просмотреть файл

@@ -130,7 +130,7 @@ public class TaBuildingDynamicController extends BaseController {
130 130
                                              @RequestParam(required = false)String isEnlist,
131 131
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,
132 132
                                              @RequestParam(required = false)String activityStatus,HttpServletRequest request){
133
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus);
133
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus,getTaPersonBuildingListByUserId(request));
134 134
         return responseBean;
135 135
     }
136 136
 
@@ -155,7 +155,7 @@ public class TaBuildingDynamicController extends BaseController {
155 155
                                              @RequestParam(required = false)String isEnlist,
156 156
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,
157 157
                                              @RequestParam(required = false)String activityStatus,HttpServletRequest request){
158
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectedList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus);
158
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectedList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus,getTaPersonBuildingListByUserId(request));
159 159
         return responseBean;
160 160
     }
161 161
 

+ 184
- 0
src/main/java/com/huiju/estateagents/controller/TaCustomImgController.java Просмотреть файл

@@ -0,0 +1,184 @@
1
+package com.huiju.estateagents.controller;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.huiju.estateagents.base.BaseController;
7
+import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.CommConstant;
9
+import com.huiju.estateagents.entity.TaCustomImg;
10
+import com.huiju.estateagents.service.ITaCustomImgService;
11
+import org.apache.commons.codec.language.DaitchMokotoffSoundex;
12
+import org.slf4j.Logger;
13
+import org.slf4j.LoggerFactory;
14
+import org.springframework.beans.factory.annotation.Autowired;
15
+import org.springframework.web.bind.annotation.*;
16
+
17
+import javax.servlet.http.HttpServletRequest;
18
+import java.time.LocalDateTime;
19
+
20
+/**
21
+ * <p>
22
+    *  前端控制器
23
+    * </p>
24
+ *
25
+ * @author jobob
26
+ * @since 2019-12-17
27
+ */
28
+@RestController
29
+@RequestMapping("/api")
30
+public class TaCustomImgController extends BaseController {
31
+
32
+    private final Logger logger = LoggerFactory.getLogger(TaCustomImgController.class);
33
+
34
+    @Autowired
35
+    public ITaCustomImgService iTaCustomImgService;
36
+
37
+
38
+    /**
39
+     * 分页查询列表
40
+     * @param pageNum
41
+     * @param pageSize
42
+     * @return
43
+     */
44
+    @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.GET)
45
+    public ResponseBean taCustomImgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
46
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
47
+        ResponseBean responseBean = new ResponseBean();
48
+        try {
49
+            //使用分页插件
50
+		    IPage<TaCustomImg> pg = new Page<>(pageNum, pageSize);
51
+            QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
52
+            queryWrapper.orderByDesc("create_time");
53
+
54
+            IPage<TaCustomImg> result = iTaCustomImgService.page(pg, queryWrapper);
55
+            responseBean.addSuccess(result);
56
+        }catch (Exception e){
57
+            e.printStackTrace();
58
+            logger.error("taCustomImgList -=- {}",e.toString());
59
+            responseBean.addError(e.getMessage());
60
+        }
61
+        return responseBean;
62
+    }
63
+
64
+    /**
65
+     * 保存对象
66
+     * @param taCustomImg 实体对象
67
+     * @return
68
+     */
69
+    @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.POST)
70
+    public ResponseBean taCustomImgAdd(@RequestBody TaCustomImg taCustomImg, HttpServletRequest request){
71
+        ResponseBean responseBean = new ResponseBean();
72
+        taCustomImg.setImgDesc(CommConstant.BANNER_INDEX.equals(taCustomImg.getImgType()) ? "小程序首页分享配图" : "小程序首页推荐客户入口配图");
73
+        try {
74
+            taCustomImg.setCreateTime(LocalDateTime.now());
75
+            taCustomImg.setUpdateTime(LocalDateTime.now());
76
+            boolean countFlag = iTaCustomImgService.countCustomImg(taCustomImg, getOrgId(request));
77
+            if (!countFlag){
78
+                responseBean.addError("您已新增首页分享或推荐客户图,请勿重复添加");
79
+                return responseBean;
80
+            }
81
+
82
+            taCustomImg.setOrgId(getOrgId(request));
83
+            if (iTaCustomImgService.save(taCustomImg)){
84
+                responseBean.addSuccess(taCustomImg);
85
+            }else {
86
+                responseBean.addError("fail");
87
+            }
88
+        }catch (Exception e){
89
+            e.printStackTrace();
90
+            logger.error("taCustomImgAdd -=- {}",e.toString());
91
+            responseBean.addError(e.getMessage());
92
+        }
93
+        return responseBean;
94
+    }
95
+
96
+    /**
97
+     * 根据id删除对象
98
+     * @param id  实体ID
99
+     */
100
+    @ResponseBody
101
+    @RequestMapping(value="/admin/taCustomImg/{id}", method= RequestMethod.DELETE)
102
+    public ResponseBean taCustomImgDelete(@PathVariable Integer id){
103
+        ResponseBean responseBean = new ResponseBean();
104
+        try {
105
+            if(iTaCustomImgService.removeById(id)){
106
+                responseBean.addSuccess("success");
107
+            }else {
108
+                responseBean.addError("fail");
109
+            }
110
+        }catch (Exception e){
111
+            e.printStackTrace();
112
+            logger.error("taCustomImgDelete -=- {}",e.toString());
113
+            responseBean.addError(e.getMessage());
114
+        }
115
+        return responseBean;
116
+    }
117
+
118
+    /**
119
+     * 修改对象
120
+     * @param taCustomImg 实体对象
121
+     * @return
122
+     */
123
+    @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.PUT)
124
+    public ResponseBean taCustomImgUpdate(@RequestBody TaCustomImg taCustomImg, HttpServletRequest request){
125
+        ResponseBean responseBean = new ResponseBean();
126
+        try {
127
+            taCustomImg.setUpdateTime(LocalDateTime.now());
128
+            boolean countFlag = iTaCustomImgService.countCustomImg(taCustomImg, getOrgId(request));
129
+            if (!countFlag){
130
+                responseBean.addError("您已新增首页分享或推荐客户图,请勿重复添加");
131
+                return responseBean;
132
+            }
133
+
134
+            if (iTaCustomImgService.updateById(taCustomImg)){
135
+                responseBean.addSuccess(taCustomImg);
136
+            }else {
137
+                responseBean.addError("fail");
138
+            }
139
+        }catch (Exception e){
140
+            e.printStackTrace();
141
+            logger.error("taCustomImgUpdate -=- {}",e.toString());
142
+            responseBean.addError(e.getMessage());
143
+        }
144
+        return responseBean;
145
+    }
146
+
147
+    /**
148
+     * 根据id查询对象
149
+     * @param id  实体ID
150
+     */
151
+    @RequestMapping(value="/admin/taCustomImg/{id}",method= RequestMethod.GET)
152
+    public ResponseBean taCustomImgGet(@PathVariable Integer id){
153
+        ResponseBean responseBean = new ResponseBean();
154
+        try {
155
+            responseBean.addSuccess(iTaCustomImgService.getById(id));
156
+        }catch (Exception e){
157
+            e.printStackTrace();
158
+            logger.error("taCustomImgDelete -=- {}",e.toString());
159
+            responseBean.addError(e.getMessage());
160
+        }
161
+        return responseBean;
162
+    }
163
+
164
+    /**
165
+     * 微信接口获取首页分享或推荐客户图
166
+     * @param imgType
167
+     */
168
+    @RequestMapping(value="/wx/taCustomImg",method= RequestMethod.GET)
169
+    public ResponseBean taCustomImgGet(@RequestParam(value ="imgType") String imgType,HttpServletRequest request){
170
+        ResponseBean responseBean = new ResponseBean();
171
+        try {
172
+            QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
173
+            queryWrapper.eq("img_type", imgType);
174
+            queryWrapper.eq("org_id", getOrgId(request));
175
+            TaCustomImg taCustomImg = iTaCustomImgService.getOne(queryWrapper);
176
+            responseBean.addSuccess(taCustomImg);
177
+        }catch (Exception e){
178
+            e.printStackTrace();
179
+            logger.error(" taCustomImgGet-=- {}",e.toString());
180
+            responseBean.addError(e.getMessage());
181
+        }
182
+        return responseBean;
183
+    }
184
+}

+ 5
- 0
src/main/java/com/huiju/estateagents/controller/TaGoodsController.java Просмотреть файл

@@ -10,6 +10,7 @@ import com.huiju.estateagents.common.JWTUtils;
10 10
 import com.huiju.estateagents.common.StringUtils;
11 11
 import com.huiju.estateagents.entity.TaGoods;
12 12
 import com.huiju.estateagents.entity.TaPerson;
13
+import com.huiju.estateagents.entity.TaPersonBuilding;
13 14
 import com.huiju.estateagents.service.ITaBuildingService;
14 15
 import com.huiju.estateagents.service.ITaGoodsService;
15 16
 import com.huiju.estateagents.service.ITaPersonService;
@@ -27,6 +28,7 @@ import java.lang.invoke.ConstantCallSite;
27 28
 import java.util.HashMap;
28 29
 import java.util.List;
29 30
 import java.util.Map;
31
+import java.util.stream.Collectors;
30 32
 
31 33
 /**
32 34
  * <p>
@@ -78,6 +80,8 @@ public class TaGoodsController extends BaseController {
78 80
                                     @RequestParam(value ="status",required = false) Integer status,HttpServletRequest request){
79 81
         ResponseBean responseBean = new ResponseBean();
80 82
         try {
83
+            List<TaPersonBuilding> taPersonBuildingListByUserId = getTaPersonBuildingListByUserId(request);
84
+
81 85
             //使用分页插件
82 86
 		    IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
83 87
             QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
@@ -87,6 +91,7 @@ public class TaGoodsController extends BaseController {
87 91
             queryWrapper.eq(null != status,"status",status);
88 92
             queryWrapper.eq("org_id",getOrgId(request));
89 93
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
94
+            queryWrapper.in(taPersonBuildingListByUserId.size()>0,"building_id",taPersonBuildingListByUserId.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
90 95
             queryWrapper.orderByDesc("create_date");
91 96
 
92 97
             IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaNewsController.java Просмотреть файл

@@ -84,7 +84,7 @@ public class TaNewsController extends BaseController {
84 84
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
85 85
                                    @RequestParam(value = "title", required = false) String title,
86 86
                                    @RequestParam(value = "cityId", required = false) Integer cityId){
87
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId);
87
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId,getTaPersonBuildingListByUserId(request));
88 88
         return responseBean;
89 89
     }
90 90
 

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaNewsTypeController.java Просмотреть файл

@@ -60,7 +60,7 @@ public class TaNewsTypeController extends BaseController {
60 60
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
61 61
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
62 62
                                        HttpServletRequest request){
63
-        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request));
63
+        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request),getTaPersonBuildingListByUserId(request));
64 64
         return responseBean;
65 65
     }
66 66
 

+ 70
- 1
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java Просмотреть файл

@@ -11,6 +11,7 @@ import com.huiju.estateagents.common.JWTUtils;
11 11
 import com.huiju.estateagents.common.StringUtils;
12 12
 import com.huiju.estateagents.entity.*;
13 13
 import com.huiju.estateagents.service.*;
14
+import org.apache.commons.collections.map.HashedMap;
14 15
 import org.slf4j.Logger;
15 16
 import org.slf4j.LoggerFactory;
16 17
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
20 21
 import java.time.LocalDateTime;
21 22
 import java.time.ZoneOffset;
22 23
 import java.util.List;
24
+import java.util.Map;
23 25
 
24 26
 
25 27
 /**
@@ -239,7 +241,7 @@ public class TaPersonVisitRecordController extends BaseController {
239 241
         try {
240 242
             //使用分页插件
241 243
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
242
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getDrainageVisitRecord(pg, getOrgId(request), activityName, drainageId, shareName, shareTel);
244
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getDrainageVisitRecord(pg, getOrgId(request), activityName, drainageId, shareName, shareTel,getTaPersonBuildingListByUserId(request));
243 245
             responseBean.addSuccess(result);
244 246
             return responseBean;
245 247
         } catch (Exception e) {
@@ -291,4 +293,71 @@ public class TaPersonVisitRecordController extends BaseController {
291 293
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
292 294
         }
293 295
     }
296
+
297
+    /**
298
+     * 置业顾问分享项目、活动、资讯、助力、拼团信息
299
+     * @param pageNumber
300
+     * @param pageSize
301
+     * @param userId
302
+     * @param request
303
+     * @return
304
+     */
305
+    @RequestMapping(value = "/wx/shareRecords")
306
+    public ResponseBean wxShareRecordsByUserId(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
307
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
308
+                                              @RequestParam(value = "userId") Integer userId,
309
+                                              HttpServletRequest request){
310
+        ResponseBean responseBean = new ResponseBean();
311
+        if (userId == null){
312
+            return responseBean;
313
+        }
314
+        //使用分页插件
315
+        IPage<TaConsultantInfo> pg = new Page<>(pageNumber, pageSize);
316
+        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, userId, getOrgId(request));
317
+
318
+        List<TaConsultantInfo> taConsultantInfos = result.getRecords();
319
+        taConsultantInfos.forEach(e ->{
320
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getShareType());
321
+            switch (e.getShareType()){
322
+                case CommConstant.POSTER_CONTENT_TYPE_ACTIVITY:
323
+                    e.setActivityShareNum(shareNum);
324
+                    break;
325
+                case CommConstant.POINTS_CHANGE_HELP:
326
+                    e.setHelpActivityShareNum(shareNum);
327
+                    break;
328
+                case CommConstant.POINTS_CHANGE_GROUP:
329
+                    e.setGroupActivityShareNum(shareNum);
330
+                    break;
331
+                case CommConstant.CAROUSEL_NEWS:
332
+                    e.setNewsNum(shareNum);
333
+                    break;
334
+                case CommConstant.POSTER_CONTENT_TYPE_BUILDING:
335
+                    e.setBuildingNum(shareNum);
336
+                    break;
337
+                case CommConstant.TARGET_TYPE_H5:
338
+                    e.setDrainageShareNum(shareNum);
339
+                    break;
340
+            }
341
+        });
342
+        result.setRecords(taConsultantInfos);
343
+        return ResponseBean.success(result);
344
+    }
345
+
346
+    @RequestMapping(value = "/wx/sharePersonInfoList")
347
+    public ResponseBean getSharePersonList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
348
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
349
+                                           @RequestParam(value = "userId") Integer userId,
350
+                                           @RequestParam(value = "targetId")Integer targetId,
351
+                                           HttpServletRequest request){
352
+        try {
353
+            //使用分页插件
354
+            IPage<TaPerson> pg = new Page<>(pageNumber, pageSize);
355
+            IPage<TaPerson> result = iTaPersonVisitRecordService.getSharePersonList(pg, getOrgId(request), userId, targetId);
356
+            return ResponseBean.success(result);
357
+        }catch (Exception e){
358
+            e.printStackTrace();
359
+            logger.error("taPersonVisitRecordList -=- {}",e.toString());
360
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
361
+        }
362
+    }
294 363
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java Просмотреть файл

@@ -80,7 +80,7 @@ public class TaPointsExchangeController extends BaseController {
80 80
             taPointsExchange.setTel(tel);
81 81
             taPointsExchange.setOrgId(getOrgId(request));
82 82
             
83
-            responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
83
+            responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange,getTaPersonBuildingListByUserId(request));
84 84
 
85 85
         }catch (Exception e){
86 86
             e.printStackTrace();

+ 5
- 5
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Просмотреть файл

@@ -196,10 +196,10 @@ public class TaRecommendCustomerController extends BaseController {
196 196
      * @return
197 197
      */
198 198
     @PostMapping("/wx/customer/report")
199
-    public ResponseBean reportCust(@RequestParam(value ="tips",required = false) Boolean tips, @RequestBody String paramStr, HttpServletRequest request) {
199
+    public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
200 200
         String openid = getOpenId(request);
201 201
         Integer orgId = getOrgId(request);
202
-        return taRecommendCustomerService.reportCust(paramStr, openid,orgId,tips);
202
+        return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
203 203
     }
204 204
 
205 205
     @PostMapping("/wx/customer/recommend")
@@ -320,7 +320,7 @@ public class TaRecommendCustomerController extends BaseController {
320 320
 //                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
321 321
 //                buildingId = personBuilding.getBuildingId();
322 322
 //            }
323
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
323
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request)));
324 324
         }catch (Exception e){
325 325
             e.printStackTrace();
326 326
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -342,7 +342,7 @@ public class TaRecommendCustomerController extends BaseController {
342 342
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
343 343
                                          @RequestParam(value = "sex",required = false)Integer sex){
344 344
         try{
345
-            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request)));
345
+            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request),getTaPersonBuildingListByUserId(request)));
346 346
         }catch (Exception e){
347 347
             e.printStackTrace();
348 348
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -363,7 +363,7 @@ public class TaRecommendCustomerController extends BaseController {
363 363
                                          @RequestParam(value = "sex",required = false)Integer sex, HttpServletRequest request){
364 364
         Integer orgid = getOrgId(request);
365 365
         try{
366
-            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgid));
366
+            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgid,getTaPersonBuildingListByUserId(request)));
367 367
         }catch (Exception e){
368 368
             e.printStackTrace();
369 369
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java Просмотреть файл

@@ -88,7 +88,7 @@ public class TaShareActivityController extends BaseController {
88 88
                                             HttpServletRequest request){
89 89
         ResponseBean responseBean = new ResponseBean();
90 90
         try {
91
-            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, activityStatus, null, null, cityId, getOrgId(request));
91
+            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, activityStatus, null, null, cityId, getOrgId(request),getTaPersonBuildingListByUserId(request));
92 92
         }catch (Exception e){
93 93
             e.printStackTrace();
94 94
             logger.error("taShareActivityList -=- {}",e.toString());
@@ -114,7 +114,7 @@ public class TaShareActivityController extends BaseController {
114 114
                                             HttpServletRequest request){
115 115
         ResponseBean responseBean = new ResponseBean();
116 116
         try {
117
-            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status,name);
117
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status,name,getTaPersonBuildingListByUserId(request));
118 118
         }catch (Exception e){
119 119
             e.printStackTrace();
120 120
             logger.error("taShareActivityList -=- {}",e.toString());

+ 50
- 0
src/main/java/com/huiju/estateagents/entity/TaConsultantInfo.java Просмотреть файл

@@ -0,0 +1,50 @@
1
+package com.huiju.estateagents.entity;
2
+
3
+import lombok.Data;
4
+
5
+@Data
6
+public class TaConsultantInfo {
7
+    private Integer targetId;
8
+
9
+    private String shareType;
10
+
11
+    private String buildingUrl;
12
+
13
+    private String buildingName;
14
+
15
+    private Integer buildingNum;
16
+
17
+    private String address;
18
+
19
+    private String price;
20
+
21
+    private String activityImg;
22
+
23
+    private String activityName;
24
+
25
+    private Integer activityShareNum;
26
+
27
+    private String helpActivityName;
28
+
29
+    private String helpActivityImg;
30
+
31
+    private Integer helpActivityShareNum;
32
+
33
+    private String groupActivityImg;
34
+
35
+    private String groupActivityName;
36
+
37
+    private Integer groupActivityShareNum;
38
+
39
+    private String newImg;
40
+
41
+    private String newName;
42
+
43
+    private Integer newsNum;
44
+
45
+    private String drainageImg;
46
+
47
+    private String drainageName;
48
+
49
+    private Integer drainageShareNum;
50
+}

+ 47
- 0
src/main/java/com/huiju/estateagents/entity/TaCustomImg.java Просмотреть файл

@@ -0,0 +1,47 @@
1
+package com.huiju.estateagents.entity;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
5
+import lombok.Data;
6
+import lombok.EqualsAndHashCode;
7
+import lombok.experimental.Accessors;
8
+
9
+import java.io.Serializable;
10
+import java.time.LocalDateTime;
11
+
12
+/**
13
+ * <p>
14
+ * 
15
+ * </p>
16
+ *
17
+ * @author jobob
18
+ * @since 2019-12-17
19
+ */
20
+@Data
21
+@EqualsAndHashCode(callSuper = false)
22
+@Accessors(chain = true)
23
+public class TaCustomImg implements Serializable {
24
+
25
+    private static final long serialVersionUID = 1L;
26
+
27
+    @TableId(value = "img_id", type = IdType.AUTO)
28
+    private Integer imgId;
29
+
30
+    private String imgUrl;
31
+
32
+    private String imgType;
33
+
34
+    private String imgDesc;
35
+
36
+    private String imgDocument;
37
+
38
+    private Integer orgId;
39
+
40
+    private Integer status;
41
+
42
+    private LocalDateTime createTime;
43
+
44
+    private LocalDateTime updateTime;
45
+
46
+
47
+}

+ 1
- 1
src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java Просмотреть файл

@@ -102,7 +102,7 @@ public class AccessInterceptor implements HandlerInterceptor {
102 102
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
103 103
             return false;
104 104
         }
105
-        
105
+
106 106
         // 白名单跳过
107 107
         if (inWhiteList(request)) {
108 108
             return true;

+ 3
- 2
src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java Просмотреть файл

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.huiju.estateagents.entity.HelpActivity;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6 7
 import org.apache.ibatis.annotations.Mapper;
7 8
 import org.apache.ibatis.annotations.Param;
8 9
 
@@ -31,7 +32,7 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
31 32
      * @param orgId
32 33
      * @return
33 34
      */
34
-    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
35
+    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
35 36
 
36 37
     void updateActivityToUnStart();
37 38
 
@@ -54,5 +55,5 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
54 55
      * @param orgId
55 56
      * @return
56 57
      */
57
-    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status,String name);
58
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status,String name,List<TaPersonBuilding> personBuildingList);
58 59
 }

+ 4
- 2
src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java Просмотреть файл

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.huiju.estateagents.entity.TaBuildingDynamic;
7
+import com.huiju.estateagents.entity.TaPersonBuilding;
7 8
 import org.apache.ibatis.annotations.Mapper;
8 9
 import org.apache.ibatis.annotations.Param;
9 10
 import org.apache.ibatis.annotations.Update;
10 11
 
11 12
 import java.time.LocalDateTime;
13
+import java.util.List;
12 14
 import java.util.Map;
13 15
 
14 16
 /**
@@ -28,7 +30,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
28 30
      * @param selected
29 31
      * @return
30 32
      */
31
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId, @Param("cityId") Integer cityId, @Param("isEnlist") String isEnlist, @Param("time") LocalDateTime time, @Param("title") String title, @Param("orgId") Integer orgId,@Param("activityStatus") String activityStatus);
33
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId, @Param("cityId") Integer cityId, @Param("isEnlist") String isEnlist, @Param("time") LocalDateTime time, @Param("title") String title, @Param("orgId") Integer orgId, @Param("activityStatus") String activityStatus,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
32 34
 
33 35
     /**
34 36
      * 详情
@@ -87,5 +89,5 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
87 89
      */
88 90
     void updateProcessingActivity();
89 91
 
90
-    IPage<TaBuildingDynamic> iBuildingDynamicSelectedList(Page<TaBuildingDynamic> page, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus);
92
+    IPage<TaBuildingDynamic> iBuildingDynamicSelectedList(Page<TaBuildingDynamic> page, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList);
91 93
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java Просмотреть файл

@@ -27,7 +27,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
27 27
      * @param page
28 28
      * @return
29 29
      */
30
-    List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain, @Param("orgId") Integer orgId);
30
+    List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
31 31
 
32 32
     /**
33 33
      * 楼盘列表

+ 18
- 0
src/main/java/com/huiju/estateagents/mapper/TaCustomImgMapper.java Просмотреть файл

@@ -0,0 +1,18 @@
1
+package com.huiju.estateagents.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.huiju.estateagents.entity.TaCustomImg;
5
+import org.apache.ibatis.annotations.Mapper;
6
+
7
+/**
8
+ * <p>
9
+ *  Mapper 接口
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-12-17
14
+ */
15
+@Mapper
16
+public interface TaCustomImgMapper extends BaseMapper<TaCustomImg> {
17
+
18
+}

+ 10
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java Просмотреть файл

@@ -3,6 +3,9 @@ package com.huiju.estateagents.mapper;
3 3
 
4 4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 5
 import com.baomidou.mybatisplus.core.metadata.IPage;
6
+import com.huiju.estateagents.entity.TaConsultantInfo;
7
+import com.huiju.estateagents.entity.TaPerson;
8
+import com.huiju.estateagents.entity.TaPersonBuilding;
6 9
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
7 10
 import org.apache.ibatis.annotations.Mapper;
8 11
 import org.apache.ibatis.annotations.Param;
@@ -69,8 +72,14 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
69 72
      * @param orgId
70 73
      * @return
71 74
      */
72
-	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("drainageId") Integer drainageId, @Param("shareName") String shareName, @Param("shareTel") String shareTel);
75
+	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("drainageId") Integer drainageId, @Param("shareName") String shareName, @Param("shareTel") String shareTel,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
73 76
     IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType,@Param("personId") String personId);
74 77
 
75 78
     IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventType") String eventType);
79
+
80
+    IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId);
81
+
82
+    Integer countShareNumByEventType(@Param("targetId") Integer targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
83
+
84
+    IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, @Param("orgId") Integer orgId, @Param("userId")Integer userId, @Param("targetId")Integer targetId);
76 85
 }

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/TaPointsExchangeMapper.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.huiju.estateagents.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
+import com.huiju.estateagents.entity.TaPersonBuilding;
5 6
 import com.huiju.estateagents.entity.TaPointsExchange;
6 7
 import org.apache.ibatis.annotations.Mapper;
7 8
 import org.apache.ibatis.annotations.Param;
@@ -19,5 +20,5 @@ import java.util.List;
19 20
 @Mapper
20 21
 public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
21 22
 	
22
-	List<TaPointsExchange> selectListByParams(Page page,@Param("taPointsExchange") TaPointsExchange taPointsExchange);
23
+	List<TaPointsExchange> selectListByParams(Page page,@Param("taPointsExchange") TaPointsExchange taPointsExchange, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
23 24
 }

+ 4
- 3
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java Просмотреть файл

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
3 3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4 4
 import com.huiju.estateagents.entity.PersonIntention;
5 5
 import com.huiju.estateagents.entity.TaPerson;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6 7
 import com.huiju.estateagents.entity.TaRecommendCustomer;
7 8
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
8 9
 import com.huiju.estateagents.excel.*;
@@ -32,9 +33,9 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
32 33
 
33 34
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
34 35
 
35
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status);
36
-    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
37
-    IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId);
36
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
37
+    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
38
+    IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
38 39
     IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
39 40
 
40 41
     /**

+ 3
- 2
src/main/java/com/huiju/estateagents/service/IHelpActivityService.java Просмотреть файл

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4 4
 import com.huiju.estateagents.base.ResponseBean;
5 5
 import com.huiju.estateagents.entity.HelpActivity;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6 7
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
7 8
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
8 9
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -32,7 +33,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
32 33
      * @param orgId
33 34
      * @return
34 35
      */
35
-    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId);
36
+    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId,List<TaPersonBuilding> personBuildingList);
36 37
 
37 38
     /**
38 39
      * 活动助力添加
@@ -145,5 +146,5 @@ public interface IHelpActivityService extends IService<HelpActivity> {
145 146
      * @param orgId
146 147
      * @return
147 148
      */
148
-    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name);
149
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name,List<TaPersonBuilding> personBuildingList);
149 150
 }

+ 3
- 2
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java Просмотреть файл

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
7 7
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
8 8
 import com.huiju.estateagents.entity.TaBuildingDynamic;
9 9
 import com.huiju.estateagents.entity.TaPerson;
10
+import com.huiju.estateagents.entity.TaPersonBuilding;
10 11
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
11 12
 
12 13
 import java.time.LocalDateTime;
@@ -27,7 +28,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
27 28
      * 项目动态管理列表
28 29
      * @return
29 30
      */
30
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus);
31
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus,List<TaPersonBuilding> personBuildingList);
31 32
 
32 33
     /**
33 34
      * 项目详情
@@ -138,5 +139,5 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
138 139
      * @param activityStatus
139 140
      * @return
140 141
      */
141
-    ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus);
142
+    ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList);
142 143
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingService.java Просмотреть файл

@@ -24,7 +24,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
24 24
      * @param pageSize
25 25
      * @return
26 26
      */
27
-    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId);
27
+    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
28 28
 
29 29
     /**
30 30
      * 楼盘列表

+ 16
- 0
src/main/java/com/huiju/estateagents/service/ITaCustomImgService.java Просмотреть файл

@@ -0,0 +1,16 @@
1
+package com.huiju.estateagents.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.huiju.estateagents.entity.TaCustomImg;
5
+
6
+/**
7
+ * <p>
8
+ *  服务类
9
+ * </p>
10
+ *
11
+ * @author jobob
12
+ * @since 2019-12-17
13
+ */
14
+public interface ITaCustomImgService extends IService<TaCustomImg> {
15
+    boolean countCustomImg(TaCustomImg taCustomImg, Integer orgId);
16
+}

+ 2
- 1
src/main/java/com/huiju/estateagents/service/ITaNewsService.java Просмотреть файл

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
4 4
 import com.baomidou.mybatisplus.extension.service.IService;
5 5
 import com.huiju.estateagents.base.ResponseBean;
6 6
 import com.huiju.estateagents.entity.TaNews;
7
+import com.huiju.estateagents.entity.TaPersonBuilding;
7 8
 
8 9
 import java.util.List;
9 10
 
@@ -26,7 +27,7 @@ public interface ITaNewsService extends IService<TaNews> {
26 27
      * @param newsTypeId
27 28
      * @return
28 29
      */
29
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId);
30
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId,List<TaPersonBuilding> personBuildingList);
30 31
 
31 32
     /**
32 33
      * 根据Id查询资讯数据

+ 4
- 1
src/main/java/com/huiju/estateagents/service/ITaNewsTypeService.java Просмотреть файл

@@ -3,6 +3,9 @@ package com.huiju.estateagents.service;
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4 4
 import com.huiju.estateagents.base.ResponseBean;
5 5
 import com.huiju.estateagents.entity.TaNewsType;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
7
+
8
+import java.util.List;
6 9
 
7 10
 /**
8 11
  * <p>
@@ -22,7 +25,7 @@ public interface ITaNewsTypeService extends IService<TaNewsType> {
22 25
      * @param orgId
23 26
      * @return
24 27
      */
25
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId);
28
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList);
26 29
 
27 30
     /**
28 31
      * 根据Id查询资讯类型数据

+ 10
- 1
src/main/java/com/huiju/estateagents/service/ITaPersonVisitRecordService.java Просмотреть файл

@@ -3,8 +3,11 @@ package com.huiju.estateagents.service;
3 3
 
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.service.IService;
6
+import com.huiju.estateagents.entity.TaConsultantInfo;
6 7
 import com.huiju.estateagents.entity.TaPerson;
8
+import com.huiju.estateagents.entity.TaPersonBuilding;
7 9
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
10
+import io.swagger.models.auth.In;
8 11
 
9 12
 import java.util.List;
10 13
 
@@ -46,5 +49,11 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
46 49
 //    IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
47 50
 //    TaPerson customerInfo(String personId);
48 51
 
49
-	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel);
52
+	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel, List<TaPersonBuilding> taPersonBuildingList);
53
+
54
+	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId);
55
+
56
+	Integer countShareNumByEventType(Integer targetId, Integer orgId, Integer userId, String eventType);
57
+
58
+	IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, Integer targetId);
50 59
 }

+ 4
- 1
src/main/java/com/huiju/estateagents/service/ITaPointsExchangeService.java Просмотреть файл

@@ -3,8 +3,11 @@ package com.huiju.estateagents.service;
3 3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4 4
 import com.baomidou.mybatisplus.extension.service.IService;
5 5
 import com.huiju.estateagents.base.ResponseBean;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6 7
 import com.huiju.estateagents.entity.TaPointsExchange;
7 8
 
9
+import java.util.List;
10
+
8 11
 /**
9 12
  * <p>
10 13
  * 积分兑换记录  服务类
@@ -15,5 +18,5 @@ import com.huiju.estateagents.entity.TaPointsExchange;
15 18
  */
16 19
 public interface ITaPointsExchangeService extends IService<TaPointsExchange> {
17 20
 	
18
-	ResponseBean selectList(Integer pageNum, Integer pageSize, TaPointsExchange taPointsExchange);
21
+	ResponseBean selectList(Integer pageNum, Integer pageSize, TaPointsExchange taPointsExchange, List<TaPersonBuilding> taPersonBuildingList);
19 22
 }

+ 5
- 4
src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java Просмотреть файл

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
3 3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4 4
 import com.huiju.estateagents.base.ResponseBean;
5 5
 import com.huiju.estateagents.entity.TaPerson;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6 7
 import com.huiju.estateagents.entity.TaRecommendCustomer;
7 8
 import com.baomidou.mybatisplus.extension.service.IService;
8 9
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
@@ -30,15 +31,15 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
30 31
 
31 32
     ResponseBean recommendCust(String paramStr, String openid,Integer orgId);
32 33
 
33
-    ResponseBean reportCust(String paramStr, String openid,Integer orgId,Boolean tips);
34
+    ResponseBean reportCust(String paramStr, String openid,Integer orgId);
34 35
 
35 36
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
36 37
 
37
-    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);
38
+    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);
38 39
 
39
-    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);
40
+    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);
40 41
 
41
-    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);
42
+    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);
42 43
 
43 44
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
44 45
 

+ 3
- 2
src/main/java/com/huiju/estateagents/service/ITaShareActivityService.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
2 2
 
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4 4
 import com.huiju.estateagents.base.ResponseBean;
5
+import com.huiju.estateagents.entity.TaPersonBuilding;
5 6
 import com.huiju.estateagents.entity.TaShareActivity;
6 7
 
7 8
 import java.time.LocalDateTime;
@@ -17,7 +18,7 @@ import java.util.List;
17 18
  */
18 19
 public interface ITaShareActivityService extends IService<TaShareActivity> {
19 20
 
20
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
21
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId,List<TaPersonBuilding> personBuildingList);
21 22
 
22 23
     /**
23 24
      * 判断活动是否开始
@@ -42,7 +43,7 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
42 43
      * @param orgId
43 44
      * @return
44 45
      */
45
-    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name);
46
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name,List<TaPersonBuilding> personBuildingList);
46 47
 
47 48
     Integer countGroupBuyPeople(TaShareActivity taShareActivity);
48 49
 }

+ 5
- 8
src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java Просмотреть файл

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8 8
 import com.huiju.estateagents.common.StringUtils;
9
-import com.huiju.estateagents.entity.HelpActivity;
10
-import com.huiju.estateagents.entity.HelpInitiateRecord;
11
-import com.huiju.estateagents.entity.HelpRecord;
12
-import com.huiju.estateagents.entity.TaShareActivity;
9
+import com.huiju.estateagents.entity.*;
13 10
 import com.huiju.estateagents.event.EventBus;
14 11
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
15 12
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
@@ -56,10 +53,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
56 53
     TaShareActivityMapper taShareActivityMapper;
57 54
 
58 55
     @Override
59
-    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId) {
56
+    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId,List<TaPersonBuilding> personBuildingList) {
60 57
         ResponseBean responseBean = new ResponseBean<>();
61 58
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
62
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
59
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId,personBuildingList);
63 60
         responseBean.addSuccess(result);
64 61
         return responseBean;
65 62
     }
@@ -222,10 +219,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
222 219
     }
223 220
 
224 221
     @Override
225
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name) {
222
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name,List<TaPersonBuilding> personBuildingList) {
226 223
         ResponseBean responseBean = new ResponseBean<>();
227 224
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
228
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status,name);
225
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status,name,personBuildingList);
229 226
         responseBean.addSuccess(result);
230 227
         return responseBean;
231 228
     }

+ 4
- 4
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Просмотреть файл

@@ -74,12 +74,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
74 74
         binder.registerCustomEditor(Date.class, editor);
75 75
     }
76 76
     @Override
77
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus) {
77
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus,List<TaPersonBuilding> personBuildingList) {
78 78
         Page<TaBuildingDynamic> page = new Page<>();
79 79
         page.setSize(pageSize == null ? 10 : pageSize);
80 80
         page.setCurrent(pageNum == null ? 1 : pageNum);
81 81
 
82
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus);
82
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus,personBuildingList);
83 83
 
84 84
         HashMap hashMap= new HashMap<>();
85 85
         hashMap.put("list",buildingDynamic.getRecords());
@@ -383,12 +383,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
383 383
      * @return
384 384
      */
385 385
     @Override
386
-    public ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus) {
386
+    public ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList) {
387 387
         Page<TaBuildingDynamic> page = new Page<>();
388 388
         page.setSize(pageSize == null ? 10 : pageSize);
389 389
         page.setCurrent(pageNum == null ? 1 : pageNum);
390 390
 
391
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.iBuildingDynamicSelectedList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus);
391
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.iBuildingDynamicSelectedList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus,personBuildingList);
392 392
 
393 393
         HashMap hashMap= new HashMap<>();
394 394
         hashMap.put("list",buildingDynamic.getRecords());

+ 3
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Просмотреть файл

@@ -91,12 +91,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
91 91
     private ITaBuildingMapRelationService iTaBuildingMapRelationService;
92 92
 
93 93
     @Override
94
-    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
94
+    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
95 95
         Page<TaBuilding> page = new Page<>();
96 96
         page.setSize(pageSize == null ? 10 : pageSize);
97 97
         page.setCurrent(pageNum == null ? 1 : pageNum);
98 98
 
99
-        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
99
+        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId,taPersonBuildingList);
100 100
 
101 101
         if (null != buildings) {
102 102
             for(TaBuilding taBuilding: buildings) {
@@ -846,6 +846,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
846 846
         taBuildingQueryWrapper.eq("city_id", taBuilding.getCityId());
847 847
         taBuildingQueryWrapper.eq("is_main", 1);
848 848
         taBuildingQueryWrapper.eq("status", 1);
849
+        taBuildingQueryWrapper.eq("org_id", taBuilding.getOrgId());
849 850
         if (taBuilding.getBuildingId() != null){
850 851
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
851 852
         }

+ 43
- 0
src/main/java/com/huiju/estateagents/service/impl/TaCustomImgServiceImpl.java Просмотреть файл

@@ -0,0 +1,43 @@
1
+package com.huiju.estateagents.service.impl;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.estateagents.base.ResponseBean;
6
+import com.huiju.estateagents.common.CommConstant;
7
+import com.huiju.estateagents.entity.TaCustomImg;
8
+import com.huiju.estateagents.mapper.TaCustomImgMapper;
9
+import com.huiju.estateagents.service.ITaCustomImgService;
10
+import org.springframework.beans.factory.annotation.Autowired;
11
+import org.springframework.stereotype.Service;
12
+
13
+/**
14
+ * <p>
15
+ *  服务实现类
16
+ * </p>
17
+ *
18
+ * @author jobob
19
+ * @since 2019-12-17
20
+ */
21
+@Service
22
+public class TaCustomImgServiceImpl extends ServiceImpl<TaCustomImgMapper, TaCustomImg> implements ITaCustomImgService {
23
+
24
+    @Autowired
25
+    private TaCustomImgMapper taCustomImgMapper;
26
+
27
+    @Override
28
+    public boolean countCustomImg(TaCustomImg taCustomImg, Integer orgId) {
29
+        ResponseBean responseBean = new ResponseBean();
30
+        QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
31
+        queryWrapper.eq("img_type", taCustomImg.getImgType());
32
+        queryWrapper.eq("org_id", orgId);
33
+        if (taCustomImg.getImgId() != null){
34
+            queryWrapper.ne("img_id", taCustomImg.getImgId());
35
+        }
36
+        TaCustomImg indexTacustomImg = taCustomImgMapper.selectOne(queryWrapper);
37
+        if (indexTacustomImg != null){
38
+            responseBean.addError("您已新增了推荐图,请勿重新添加");
39
+            return false;
40
+        }
41
+        return true;
42
+    }
43
+}

+ 4
- 5
src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java Просмотреть файл

@@ -8,10 +8,7 @@ import com.huiju.estateagents.base.ResponseBean;
8 8
 import com.huiju.estateagents.common.BeanTools;
9 9
 import com.huiju.estateagents.common.CommConstant;
10 10
 import com.huiju.estateagents.common.StringUtils;
11
-import com.huiju.estateagents.entity.TaBuilding;
12
-import com.huiju.estateagents.entity.TaNews;
13
-import com.huiju.estateagents.entity.TaNewsType;
14
-import com.huiju.estateagents.entity.TaSave;
11
+import com.huiju.estateagents.entity.*;
15 12
 import com.huiju.estateagents.exception.EstaException;
16 13
 import com.huiju.estateagents.mapper.TaFavorMapper;
17 14
 import com.huiju.estateagents.mapper.TaNewsMapper;
@@ -23,6 +20,7 @@ import org.springframework.stereotype.Service;
23 20
 
24 21
 import java.time.LocalDateTime;
25 22
 import java.util.List;
23
+import java.util.stream.Collectors;
26 24
 
27 25
 /**
28 26
  * <p>
@@ -58,7 +56,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
58 56
 
59 57
 
60 58
     @Override
61
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId) {
59
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId,List<TaPersonBuilding> personBuildingList) {
62 60
         ResponseBean responseBean = new ResponseBean();
63 61
 
64 62
         IPage<TaNews> page = new Page<>();
@@ -73,6 +71,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
73 71
         taNewsQueryWrapper.eq("status", 1);
74 72
         taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
75 73
         taNewsQueryWrapper.like(title!=null,"news_name", title);
74
+        taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
76 75
         taNewsQueryWrapper.orderByAsc("news_status");
77 76
         taNewsQueryWrapper.orderByDesc("weight","create_date");
78 77
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);

+ 5
- 1
src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java Просмотреть файл

@@ -9,6 +9,7 @@ import com.huiju.estateagents.common.BeanTools;
9 9
 import com.huiju.estateagents.entity.TaBuilding;
10 10
 import com.huiju.estateagents.entity.TaNews;
11 11
 import com.huiju.estateagents.entity.TaNewsType;
12
+import com.huiju.estateagents.entity.TaPersonBuilding;
12 13
 import com.huiju.estateagents.exception.EstaException;
13 14
 import com.huiju.estateagents.mapper.TaNewsTypeMapper;
14 15
 import com.huiju.estateagents.service.ITaBuildingService;
@@ -19,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
19 20
 import org.springframework.stereotype.Service;
20 21
 
21 22
 import java.time.LocalDateTime;
23
+import java.util.List;
24
+import java.util.stream.Collectors;
22 25
 
23 26
 /**
24 27
  * <p>
@@ -39,7 +42,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
39 42
 
40 43
 
41 44
     @Override
42
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId) {
45
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
43 46
         ResponseBean responseBean = new ResponseBean();
44 47
         IPage<TaNewsType> page = new Page<>();
45 48
         page.setCurrent(pageNum);
@@ -49,6 +52,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
49 52
         taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
50 53
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
51 54
         taNewsQueryWrapper.eq("status", 1);
55
+        taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id", personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
52 56
         taNewsQueryWrapper.orderByDesc("create_date");
53 57
         IPage<TaNewsType> typeIPage = this.page(page, taNewsQueryWrapper);
54 58
 

+ 22
- 9
src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java Просмотреть файл

@@ -12,13 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
12 12
 import com.huiju.estateagents.common.CommConstant;
13 13
 import com.huiju.estateagents.drainage.entity.TaDrainage;
14 14
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
15
-import com.huiju.estateagents.entity.HelpActivity;
16
-import com.huiju.estateagents.entity.TaBuildingDynamic;
17
-import com.huiju.estateagents.entity.TaNews;
18
-import com.huiju.estateagents.entity.TaPerson;
19
-import com.huiju.estateagents.entity.TaPersonVisitRecord;
20
-import com.huiju.estateagents.entity.TaRecommendCustomer;
21
-import com.huiju.estateagents.entity.TaShareActivity;
15
+import com.huiju.estateagents.entity.*;
22 16
 import com.huiju.estateagents.mapper.HelpActivityMapper;
23 17
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
24 18
 import com.huiju.estateagents.mapper.TaNewsMapper;
@@ -125,8 +119,8 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
125 119
 	}
126 120
 
127 121
 	@Override
128
-	public IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel) {
129
-		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, drainageId, shareName, shareTel);
122
+	public IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel, List<TaPersonBuilding> taPersonBuildingList) {
123
+		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, drainageId, shareName, shareTel,taPersonBuildingList);
130 124
 		List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordIPage.getRecords();
131 125
 		taPersonVisitRecords.forEach(e -> {
132 126
 			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());
@@ -144,6 +138,25 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
144 138
 		taPersonVisitRecordIPage.setRecords(taPersonVisitRecords);
145 139
 		return taPersonVisitRecordIPage;
146 140
 	}
141
+
142
+	@Override
143
+	public IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId) {
144
+		IPage<TaConsultantInfo> result = personVisitRecordMapper.getConsultantShareInfoList(pg,userId,orgId);
145
+		return result;
146
+	}
147
+
148
+	@Override
149
+	public Integer countShareNumByEventType(Integer targetId, Integer orgId, Integer userId, String eventType) {
150
+		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
151
+	}
152
+
153
+	@Override
154
+	public IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, Integer targetId) {
155
+		IPage<TaPerson> result = personVisitRecordMapper.getSharePersonList(pg, orgId, userId, targetId);
156
+		return result;
157
+	}
158
+
159
+
147 160
 	/**
148 161
 	 * 分页获取个人中心访客记录
149 162
 	 *

+ 3
- 2
src/main/java/com/huiju/estateagents/service/impl/TaPointsExchangeServiceImpl.java Просмотреть файл

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
4 4
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 5
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 6
 import com.huiju.estateagents.base.ResponseBean;
7
+import com.huiju.estateagents.entity.TaPersonBuilding;
7 8
 import com.huiju.estateagents.entity.TaPointsExchange;
8 9
 import com.huiju.estateagents.mapper.TaPointsExchangeMapper;
9 10
 import com.huiju.estateagents.service.ITaPointsExchangeService;
@@ -34,10 +35,10 @@ public class TaPointsExchangeServiceImpl extends ServiceImpl<TaPointsExchangeMap
34 35
 	 * @return
35 36
 	 */
36 37
 	@Override
37
-	public ResponseBean selectList(Integer pageNum, Integer pageSize,TaPointsExchange taPointsExchange) {
38
+	public ResponseBean selectList(Integer pageNum, Integer pageSize,TaPointsExchange taPointsExchange,List<TaPersonBuilding> taPersonBuildingList) {
38 39
 		Page page = new Page(pageNum,pageSize);
39 40
 		// 分页查询
40
-		List<TaPointsExchange> list = taPointsExchangeMapper.selectListByParams(page,taPointsExchange);
41
+		List<TaPointsExchange> list = taPointsExchangeMapper.selectListByParams(page,taPointsExchange,taPersonBuildingList);
41 42
 		page.setRecords(list);
42 43
 		return ResponseBean.success(page);
43 44
 	}

+ 12
- 12
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java Просмотреть файл

@@ -293,14 +293,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
293 293
 
294 294
 
295 295
     @Override
296
-    public ResponseBean reportCust(String paramStr, String openid,Integer orgId,Boolean tips) {
296
+    public ResponseBean reportCust(String paramStr, String openid,Integer orgId) {
297 297
         JSONObject params = JSONObject.parseObject(paramStr);
298 298
         if (null == params) {
299
-            return ResponseBean.error(tips ? "" : "解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
299
+            return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
300 300
         }
301 301
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
302 302
         if (null == taPersons || taPersons.size() != 1) {
303
-            return ResponseBean.error(tips ? "" : "验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
303
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
304 304
         }
305 305
         TaPerson taPerson = taPersons.get(0);
306 306
 
@@ -355,7 +355,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
355 355
         TaPerson currentPerson = taPersonMapper.selectOne(personQueryWrapper);
356 356
         if(null != currentPerson){
357 357
             if (currentPerson.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
358
-                return ResponseBean.error(tips ? "" : "置业顾问不可以绑定置业顾问", ResponseBean.ERROR_ILLEGAL_PARAMS);
358
+                return ResponseBean.error("置业顾问不可以绑定置业顾问", ResponseBean.ERROR_ILLEGAL_PARAMS);
359 359
             }
360 360
             taRecommendCustomer.setPersonId(currentPerson.getPersonId());
361 361
         }
@@ -391,12 +391,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
391 391
 
392 392
                 }
393 393
             }
394
-            return ResponseBean.error(tips ? "" : "您在当前项目的置业顾问是:"+conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
394
+            return ResponseBean.error("您在当前项目的置业顾问是:"+conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
395 395
         }
396 396
 
397 397
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
398 398
         if (row < 1) {
399
-            return ResponseBean.error(tips ? "" : "报备客户失败", ResponseBean.ERROR_UNAVAILABLE);
399
+            return ResponseBean.error("报备客户失败", ResponseBean.ERROR_UNAVAILABLE);
400 400
         }
401 401
 
402 402
         // 找到销售经理,并推送消息
@@ -444,7 +444,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
444 444
     }
445 445
 
446 446
     @Override
447
-    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){
447
+    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){
448 448
 
449 449
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
450 450
 
@@ -492,7 +492,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
492 492
         } else {
493 493
             // 私客
494 494
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
495
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
495
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList);
496 496
         }
497 497
 
498 498
     }
@@ -504,16 +504,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
504 504
     }
505 505
 
506 506
     @Override
507
-    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){
507
+    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){
508 508
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
509
-        return taRecommendCustomerMapper.getRecCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId);
509
+        return taRecommendCustomerMapper.getRecCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId,taPersonBuildingList);
510 510
     }
511 511
 
512 512
 
513 513
     @Override
514
-    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){
514
+    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){
515 515
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
516
-        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId);
516
+        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId,taPersonBuildingList);
517 517
     }
518 518
 
519 519
     @Override

+ 6
- 2
src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java Просмотреть файл

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8 8
 import com.huiju.estateagents.common.StringUtils;
9
+import com.huiju.estateagents.entity.TaPersonBuilding;
9 10
 import com.huiju.estateagents.entity.TaShareActivity;
10 11
 import com.huiju.estateagents.entity.TaShareRecord;
11 12
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
17 18
 
18 19
 import java.time.LocalDateTime;
19 20
 import java.util.List;
21
+import java.util.stream.Collectors;
20 22
 
21 23
 /**
22 24
  * <p>
@@ -35,7 +37,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
35 37
     private TaShareRecordMapper taShareRecordMapper;
36 38
 
37 39
     @Override
38
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String activityStatus, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId) {
40
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String activityStatus, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId,List<TaPersonBuilding> personBuildingList) {
39 41
         ResponseBean responseBean = new ResponseBean();
40 42
         Page<TaShareActivity> page = new Page<>();
41 43
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -49,6 +51,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
49 51
         queryWrapper.eq(endTime != null, "end_time", endTime);
50 52
         queryWrapper.eq(orgId != null, "org_id", orgId);
51 53
         queryWrapper.eq(cityId != null, "city_id", cityId);
54
+        queryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
52 55
         queryWrapper.orderByDesc("heavy");
53 56
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
54 57
 
@@ -83,7 +86,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
83 86
     }
84 87
 
85 88
     @Override
86
-    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name) {
89
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name,List<TaPersonBuilding> personBuildingList) {
87 90
         ResponseBean responseBean = new ResponseBean();
88 91
         Page<TaShareActivity> page = new Page<>();
89 92
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -96,6 +99,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
96 99
         queryWrapper.eq(cityId != null, "city_id", cityId);
97 100
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
98 101
         queryWrapper.like(!StringUtils.isEmpty(name), "activity_name", name);
102
+        queryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
99 103
         queryWrapper.orderByAsc("activity_status");
100 104
         queryWrapper.orderByAsc("start_time");
101 105
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);

+ 6
- 2
src/main/resources/application-prod.yml Просмотреть файл

@@ -20,7 +20,6 @@ spring:
20 20
 ##mybatis-plus
21 21
 mybatis-plus:
22 22
   configuration:
23
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
24 23
     call-setters-on-nulls: true
25 24
   mapper-locations: classpath:mapper/**/*.xml
26 25
 wx:
@@ -71,4 +70,9 @@ sms:
71 70
     sign: AI智慧案场
72 71
 
73 72
   visitor:
74
-    code: "0501"
73
+    code: "0501"
74
+
75
+#日志配置
76
+logging:
77
+  config: classpath:log/logback-spring.xml
78
+  debug: true

+ 59
- 0
src/main/resources/log/logback-spring.xml Просмотреть файл

@@ -0,0 +1,59 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<configuration debug="false">
3
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
4
+    <property name="LOG_HOME" value="/home/estateagents/estateagents-3.5/service/logs" />
5
+    <!-- 控制台输出 -->
6
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
7
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
8
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符-->
9
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
10
+        </encoder>
11
+    </appender>
12
+    <!-- 按照每天生成日志文件 -->
13
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
14
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
15
+            <!--日志文件输出的文件名-->
16
+            <FileNamePattern>${LOG_HOME}/estateagents-%d{yyyy-MM-dd}.log</FileNamePattern>
17
+            <!--日志文件保留天数-->
18
+            <MaxHistory>30</MaxHistory>
19
+        </rollingPolicy>
20
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
21
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符-->
22
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
23
+        </encoder>
24
+        <!--日志文件最大的大小-->
25
+<!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
26
+<!--            <MaxFileSize>10MB</MaxFileSize>-->
27
+<!--        </triggeringPolicy>-->
28
+    </appender>
29
+
30
+    <!-- 按照每天生成日志文件 -->
31
+    <appender name="MYSQL"  class="ch.qos.logback.core.rolling.RollingFileAppender">
32
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
33
+            <!--日志文件输出的文件名-->
34
+            <FileNamePattern>${LOG_HOME}/estateagents-%d{yyyy-MM-dd}-sql.log</FileNamePattern>
35
+            <!--日志文件保留天数-->
36
+            <MaxHistory>3</MaxHistory>
37
+        </rollingPolicy>
38
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
39
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符-->
40
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
41
+        </encoder>
42
+        <!--日志文件最大的大小-->
43
+                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
44
+                    <MaxFileSize>1024MB</MaxFileSize>
45
+                </triggeringPolicy>
46
+    </appender>
47
+
48
+    <!--myibatis log configure-->
49
+    <logger name="com.huiju.estateagents.mapper" level="DEBUG" additivity="false">
50
+        <appender-ref ref="MYSQL" />
51
+    </logger>
52
+
53
+    <!-- 日志输出级别 -->
54
+    <root level="INFO">
55
+        <appender-ref ref="STDOUT" />
56
+        <appender-ref ref="FILE" />
57
+        <appender-ref ref="MYSQL" />
58
+    </root>
59
+</configuration>

+ 12
- 0
src/main/resources/mapper/HelpActivityMapper.xml Просмотреть файл

@@ -29,6 +29,12 @@
29 29
             and ha.activity_status = #{activityStatus}
30 30
         </if>
31 31
             and ha.org_id=#{orgId}
32
+        <if test="personBuildingList != null and personBuildingList.size > 0">
33
+            AND ha.building_id in
34
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
35
+                #{personBuilding.buildingId}
36
+            </foreach>
37
+        </if>
32 38
         </where>
33 39
         GROUP BY ha.help_activity_id
34 40
         order by ha.heavy desc
@@ -119,6 +125,12 @@
119 125
             <if test="status != null">
120 126
                 and status = #{status}
121 127
             </if>
128
+            <if test="personBuildingList != null and personBuildingList.size > 0">
129
+                AND ha.building_id in
130
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
131
+                    #{personBuilding.buildingId}
132
+                </foreach>
133
+            </if>
122 134
             and ha.org_id=#{orgId}
123 135
             and ha.activity_status in (0, 1)
124 136
         </where>

+ 12
- 0
src/main/resources/mapper/TaBuildingDynamicMapper.xml Просмотреть файл

@@ -45,6 +45,12 @@
45 45
         <if test="time != null">
46 46
             and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
47 47
         </if>
48
+        <if test="personBuildingList != null and personBuildingList.size > 0">
49
+            AND tbd.building_id in
50
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
51
+                #{personBuilding.buildingId}
52
+            </foreach>
53
+        </if>
48 54
         ORDER BY tbd.heavy DESC
49 55
   </select>
50 56
 
@@ -77,6 +83,12 @@
77 83
         <if test="time != null">
78 84
             and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
79 85
         </if>
86
+        <if test="personBuildingList != null and personBuildingList.size > 0">
87
+            AND tbd.building_id in
88
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
89
+                #{personBuilding.buildingId}
90
+            </foreach>
91
+        </if>
80 92
         ORDER BY tbd.heavy DESC
81 93
     </select>
82 94
 

+ 6
- 0
src/main/resources/mapper/TaBuildingMapper.xml Просмотреть файл

@@ -29,6 +29,12 @@
29 29
             <if test="orgId != null">
30 30
                 and  ta_building.org_id = #{orgId}
31 31
             </if>
32
+            <if test="personBuildingList != null and personBuildingList.size > 0">
33
+                AND ta_building.building_id in
34
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
35
+                    #{personBuilding.buildingId}
36
+                </foreach>
37
+            </if>
32 38
         </where>
33 39
         ORDER BY status ASC, create_date DESC
34 40
     </select>

+ 5
- 0
src/main/resources/mapper/TaCustomImgMapper.xml Просмотреть файл

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

+ 63
- 0
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Просмотреть файл

@@ -148,10 +148,73 @@
148 148
             <if test="shareTel !=null and shareTel != ''">
149 149
                 and c.phone = #{shareTel}
150 150
             </if>
151
+            <if test="personBuildingList != null and personBuildingList.size > 0">
152
+                AND t.building_id in
153
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
154
+                    #{personBuilding.buildingId}
155
+                </foreach>
156
+            </if>
151 157
             order by t.visit_time desc
152 158
         ) t
153 159
         group by t.person_id, t.share_person_id
154 160
         order by t.visit_time desc
155 161
     </select>
156 162
 
163
+    <select id="getConsultantShareInfoList" resultType="com.huiju.estateagents.entity.TaConsultantInfo">
164
+        select
165
+            t.target_id,
166
+            t.event_type as share_type,
167
+            a.url as building_img,
168
+            a.building_name,
169
+            a.address,
170
+            a.price,
171
+            b.list_img_url as activity_img,
172
+            b.title as activity_name,
173
+            c.list_img as help_activity_img,
174
+            c.title as help_activity_name,
175
+            d.list_img as group_activity_img,
176
+            d.activity_name as group_activity_name,
177
+            e.news_img,
178
+            e.news_name,
179
+            f.share_img as drainage_img,
180
+            f.`name` as drainage_name
181
+        From ta_person_visit_record t
182
+        left join (select b.url, a.building_name,a.address,a.price,a.building_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.target_id = a.building_id
183
+        left join ta_building_dynamic b on t.target_id = b.dynamic_id
184
+        left join ta_help_activity c on t.target_id = c.help_activity_id
185
+        left join ta_share_activity d on t.target_id = d.group_activity_id
186
+        left join ta_news e on t.target_id = e.news_id
187
+        left join ta_drainage f on t.target_id = f.drainage_id
188
+        where
189
+        t.consultant_id = #{userId}
190
+        and t.org_id = #{orgId}
191
+        and t.`event` = 'share'
192
+        order by t.visit_time desc
193
+    </select>
194
+    <select id="countShareNumByEventType" resultType="java.lang.Integer">
195
+        select count(*) from ta_person_visit_record t
196
+        where
197
+        t.consultant_id = #{userId}
198
+        and t.org_id = #{orgId}
199
+        and t.event_type = #{eventType}
200
+        and t.target_id = #{targetId}
201
+        and t.person_id != t.share_person_id
202
+        group by t.event_type, person_id
203
+    </select>
204
+
205
+    <select id="getSharePersonList" resultType="com.huiju.estateagents.entity.TaPerson">
206
+        select
207
+        t.person_type,
208
+        t.avatarurl,
209
+        t.nickname,
210
+        a.visit_time
211
+        from ta_person t
212
+        left join ta_person_visit_record a on t.person_id = a.person_id
213
+        where
214
+        a.org_id = #{orgId}
215
+        and a.target_id = #{targetId}
216
+        and a.consultant_id = #{userId}
217
+        group by a.person_id order by a.visit_time desc
218
+    </select>
219
+
157 220
 </mapper>

+ 6
- 0
src/main/resources/mapper/TaPointsExchangeMapper.xml Просмотреть файл

@@ -58,6 +58,12 @@
58 58
         <if test="taPointsExchange.endVerifyDate != null and taPointsExchange.endVerifyDate != ''">
59 59
             and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.endVerifyDate},'%Y-%m-%d')
60 60
         </if>
61
+        <if test="personBuildingList != null and personBuildingList.size > 0">
62
+            AND t.building_id in
63
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
64
+                #{personBuilding.buildingId}
65
+            </foreach>
66
+        </if>
61 67
         order by t.create_date desc
62 68
     </select>
63 69
 </mapper>

+ 18
- 0
src/main/resources/mapper/TaRecommendCustomerMapper.xml Просмотреть файл

@@ -70,6 +70,12 @@ FROM
70 70
         <if test="sex != null and sex !=''">
71 71
             and a.sex = #{sex}
72 72
         </if>
73
+        <if test="personBuildingList != null and personBuildingList.size > 0">
74
+            AND a.building_id in
75
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
76
+                #{personBuilding.buildingId}
77
+            </foreach>
78
+        </if>
73 79
     </where>
74 80
         order by a.create_date desc
75 81
     </select>
@@ -142,6 +148,12 @@ FROM
142 148
             <if test="sex != null">
143 149
                 and a.sex = #{sex}
144 150
             </if>
151
+            <if test="personBuildingList != null and personBuildingList.size > 0">
152
+                AND a.building_id in
153
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
154
+                    #{personBuilding.buildingId}
155
+                </foreach>
156
+            </if>
145 157
         </where>
146 158
         order by a.create_date desc
147 159
     </select>
@@ -194,6 +206,12 @@ FROM
194 206
             <if test="sex != null and sex !=''">
195 207
                 and a.sex = #{sex}
196 208
             </if>
209
+            <if test="personBuildingList != null and personBuildingList.size > 0">
210
+                AND a.building_id in
211
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
212
+                    #{personBuilding.buildingId}
213
+                </foreach>
214
+            </if>
197 215
         </where>
198 216
         order by a.create_date desc
199 217
     </select>