魏熙美 5 年前
父节点
当前提交
b9c287c898
共有 23 个文件被更改,包括 80 次插入43 次删除
  1. 7
    4
      src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java
  2. 3
    2
      src/main/java/com/huiju/estateagents/controller/TaBuildingIntentionController.java
  3. 10
    3
      src/main/java/com/huiju/estateagents/controller/TaBuildingReportController.java
  4. 8
    4
      src/main/java/com/huiju/estateagents/controller/TaCustomerMessageController.java
  5. 8
    5
      src/main/java/com/huiju/estateagents/controller/TaNewsController.java
  6. 8
    5
      src/main/java/com/huiju/estateagents/controller/TaNewsTypeController.java
  7. 5
    1
      src/main/java/com/huiju/estateagents/controller/TaPolicyController.java
  8. 3
    2
      src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java
  9. 8
    4
      src/main/java/com/huiju/estateagents/controller/TdBizEventController.java
  10. 1
    1
      src/main/java/com/huiju/estateagents/mapper/TaActivityDynamicEnlistMapper.java
  11. 1
    1
      src/main/java/com/huiju/estateagents/mapper/TdBizEventMapper.java
  12. 1
    1
      src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java
  13. 1
    1
      src/main/java/com/huiju/estateagents/service/ITaBuildingIntentionService.java
  14. 1
    1
      src/main/java/com/huiju/estateagents/service/ITaNewsTypeService.java
  15. 1
    1
      src/main/java/com/huiju/estateagents/service/ITdBizEventService.java
  16. 2
    2
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java
  17. 2
    1
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingIntentionServiceImpl.java
  18. 1
    0
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java
  19. 2
    1
      src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java
  20. 1
    0
      src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java
  21. 2
    2
      src/main/java/com/huiju/estateagents/service/impl/TdBizEventServiceImpl.java
  22. 1
    1
      src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml
  23. 3
    0
      src/main/resources/mapper/TdBizEventMapper.xml

+ 7
- 4
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java 查看文件

251
 
251
 
252
 
252
 
253
     @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
253
     @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
254
-    public ResponseBean send(@PathVariable String dynamicId) {
254
+    public ResponseBean send(@PathVariable String dynamicId, HttpServletRequest request) {
255
         ResponseBean responseBean = new ResponseBean();
255
         ResponseBean responseBean = new ResponseBean();
256
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
256
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
257
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
257
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
258
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
258
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
259
         dynamic.setStatus(1);
259
         dynamic.setStatus(1);
260
         dynamic.setPublishDate(LocalDateTime.now());
260
         dynamic.setPublishDate(LocalDateTime.now());
261
+        dynamic.setOrgId(getOrgId(request));
261
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
262
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
262
         return responseBean;
263
         return responseBean;
263
     }
264
     }
264
 
265
 
265
     @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
266
     @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
266
-    public ResponseBean cancel(@PathVariable String dynamicId) {
267
+    public ResponseBean cancel(@PathVariable String dynamicId, HttpServletRequest request) {
267
         ResponseBean responseBean = new ResponseBean();
268
         ResponseBean responseBean = new ResponseBean();
268
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
269
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
269
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
270
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
270
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
271
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
271
         dynamic.setStatus(0);
272
         dynamic.setStatus(0);
273
+        dynamic.setOrgId(getOrgId(request));
272
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
274
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
273
         return responseBean;
275
         return responseBean;
274
     }
276
     }
292
     @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
294
     @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
293
     public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
295
     public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
294
                                     @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
296
                                     @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
295
-                                    @RequestParam(value = "dynamicId",required = false)String dynamicId) {
297
+                                    @RequestParam(value = "dynamicId",required = false)String dynamicId,
298
+                                    HttpServletRequest request) {
296
         Page<TaActivityDynamicEnlist> page = new Page<>();
299
         Page<TaActivityDynamicEnlist> page = new Page<>();
297
         page.setSize(pageSize);
300
         page.setSize(pageSize);
298
         page.setCurrent(pageNum);
301
         page.setCurrent(pageNum);
299
-        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId);
302
+        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId, getOrgId(request));
300
 
303
 
301
         HashMap<String, Object> map = new HashMap<>();
304
         HashMap<String, Object> map = new HashMap<>();
302
         map.put("list", signList);
305
         map.put("list", signList);

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingIntentionController.java 查看文件

19
 import org.springframework.web.bind.annotation.RestController;
19
 import org.springframework.web.bind.annotation.RestController;
20
 import com.huiju.estateagents.base.BaseController;
20
 import com.huiju.estateagents.base.BaseController;
21
 
21
 
22
+import javax.servlet.http.HttpServletRequest;
22
 import java.util.List;
23
 import java.util.List;
23
 
24
 
24
 /**
25
 /**
92
      * @return
93
      * @return
93
      */
94
      */
94
     @RequestMapping(value="/admin/taBuildingIntentionAddOrUpdate/{buildingId}",method= RequestMethod.POST)
95
     @RequestMapping(value="/admin/taBuildingIntentionAddOrUpdate/{buildingId}",method= RequestMethod.POST)
95
-    public ResponseBean taBuildingIntentionAddOrUpdate(@RequestBody List<TdBizEvent> tdBizEventList, @PathVariable String buildingId){
96
+    public ResponseBean taBuildingIntentionAddOrUpdate(@RequestBody List<TdBizEvent> tdBizEventList, @PathVariable String buildingId, HttpServletRequest request){
96
         ResponseBean responseBean = new ResponseBean();
97
         ResponseBean responseBean = new ResponseBean();
97
-        responseBean = iTaBuildingIntentionService.taBuildingIntentionAddOrUpdate(tdBizEventList, buildingId);
98
+        responseBean = iTaBuildingIntentionService.taBuildingIntentionAddOrUpdate(tdBizEventList, buildingId, getOrgId(request));
98
         return responseBean;
99
         return responseBean;
99
     }
100
     }
100
 
101
 

+ 10
- 3
src/main/java/com/huiju/estateagents/controller/TaBuildingReportController.java 查看文件

21
 import org.springframework.web.bind.annotation.RestController;
21
 import org.springframework.web.bind.annotation.RestController;
22
 import com.huiju.estateagents.base.BaseController;
22
 import com.huiju.estateagents.base.BaseController;
23
 
23
 
24
+import javax.servlet.http.HttpServletRequest;
24
 import java.time.LocalDateTime;
25
 import java.time.LocalDateTime;
25
 import java.util.ArrayList;
26
 import java.util.ArrayList;
26
 import java.util.List;
27
 import java.util.List;
51
      */
52
      */
52
     @RequestMapping(value="/admin/taBuildingReports",method= RequestMethod.GET)
53
     @RequestMapping(value="/admin/taBuildingReports",method= RequestMethod.GET)
53
     public ResponseBean taBuildingReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
54
     public ResponseBean taBuildingReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
54
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
55
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
56
+                                             HttpServletRequest request){
55
         ResponseBean responseBean = new ResponseBean();
57
         ResponseBean responseBean = new ResponseBean();
56
         try {
58
         try {
57
             //使用分页插件
59
             //使用分页插件
58
 		    IPage<TaBuildingReport> pg = new Page<>(pageNum, pageSize);
60
 		    IPage<TaBuildingReport> pg = new Page<>(pageNum, pageSize);
59
             QueryWrapper<TaBuildingReport> queryWrapper = new QueryWrapper<>();
61
             QueryWrapper<TaBuildingReport> queryWrapper = new QueryWrapper<>();
60
             queryWrapper.orderByDesc("create_date");
62
             queryWrapper.orderByDesc("create_date");
63
+            queryWrapper.eq("org_id", getOrgId(request));
61
 
64
 
62
             IPage<TaBuildingReport> result = iTaBuildingReportService.page(pg, queryWrapper);
65
             IPage<TaBuildingReport> result = iTaBuildingReportService.page(pg, queryWrapper);
63
             responseBean.addSuccess(result);
66
             responseBean.addSuccess(result);
74
      * @return
77
      * @return
75
      */
78
      */
76
     @RequestMapping(value="/admin/taBuildingReport/add",method= RequestMethod.POST)
79
     @RequestMapping(value="/admin/taBuildingReport/add",method= RequestMethod.POST)
77
-    public ResponseBean taBuildingReportAdd(@RequestBody String jsonString){
80
+    public ResponseBean taBuildingReportAdd(@RequestBody String jsonString, HttpServletRequest request){
78
         ResponseBean responseBean = new ResponseBean();
81
         ResponseBean responseBean = new ResponseBean();
82
+        Integer orgId = getOrgId(request);
79
         try {
83
         try {
80
             JSONArray jsonArray = JSONObject.parseObject(jsonString).getJSONArray("list");
84
             JSONArray jsonArray = JSONObject.parseObject(jsonString).getJSONArray("list");
81
             List<TaBuildingReport> list = new ArrayList<>();
85
             List<TaBuildingReport> list = new ArrayList<>();
82
             jsonArray.stream().forEach(e -> {
86
             jsonArray.stream().forEach(e -> {
83
                 TaBuildingReport taBuildingReport = new TaBuildingReport();
87
                 TaBuildingReport taBuildingReport = new TaBuildingReport();
88
+                taBuildingReport.setOrgId(orgId);
84
                 taBuildingReport.setReportCode(e.toString());
89
                 taBuildingReport.setReportCode(e.toString());
85
                 taBuildingReport.setCreateDate(LocalDateTime.now());
90
                 taBuildingReport.setCreateDate(LocalDateTime.now());
86
                 list.add(taBuildingReport);
91
                 list.add(taBuildingReport);
128
      */
133
      */
129
     @RequestMapping(value="/taBuildingReport/{id}",method= RequestMethod.PUT)
134
     @RequestMapping(value="/taBuildingReport/{id}",method= RequestMethod.PUT)
130
     public ResponseBean taBuildingReportUpdate(@PathVariable Integer id,
135
     public ResponseBean taBuildingReportUpdate(@PathVariable Integer id,
131
-                                        @RequestBody TaBuildingReport taBuildingReport){
136
+                                        @RequestBody TaBuildingReport taBuildingReport,
137
+                                               HttpServletRequest request){
132
         ResponseBean responseBean = new ResponseBean();
138
         ResponseBean responseBean = new ResponseBean();
133
         try {
139
         try {
140
+            taBuildingReport.setOrgId(getOrgId(request));
134
             if (iTaBuildingReportService.updateById(taBuildingReport)){
141
             if (iTaBuildingReportService.updateById(taBuildingReport)){
135
                 responseBean.addSuccess(taBuildingReport);
142
                 responseBean.addSuccess(taBuildingReport);
136
             }else {
143
             }else {

+ 8
- 4
src/main/java/com/huiju/estateagents/controller/TaCustomerMessageController.java 查看文件

54
      */
54
      */
55
     @RequestMapping(value="/admin/taCustomerMessage",method= RequestMethod.GET)
55
     @RequestMapping(value="/admin/taCustomerMessage",method= RequestMethod.GET)
56
     public ResponseBean taCustomerMessageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
56
     public ResponseBean taCustomerMessageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
57
-                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
57
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
58
+                                              HttpServletRequest request){
58
         ResponseBean responseBean = new ResponseBean();
59
         ResponseBean responseBean = new ResponseBean();
59
         try {
60
         try {
60
             //使用分页插件
61
             //使用分页插件
61
 		    IPage<TaCustomerMessage> pg = new Page<>(pageNum, pageSize);
62
 		    IPage<TaCustomerMessage> pg = new Page<>(pageNum, pageSize);
62
             QueryWrapper<TaCustomerMessage> queryWrapper = new QueryWrapper<>();
63
             QueryWrapper<TaCustomerMessage> queryWrapper = new QueryWrapper<>();
63
             queryWrapper.orderByDesc("create_date");
64
             queryWrapper.orderByDesc("create_date");
64
-
65
+            queryWrapper.eq("org_id", getOrgId(request));
65
             IPage<TaCustomerMessage> result = iTaCustomerMessageService.page(pg, queryWrapper);
66
             IPage<TaCustomerMessage> result = iTaCustomerMessageService.page(pg, queryWrapper);
66
             responseBean.addSuccess(result);
67
             responseBean.addSuccess(result);
67
         }catch (Exception e){
68
         }catch (Exception e){
78
      * @return
79
      * @return
79
      */
80
      */
80
     @RequestMapping(value="/taCustomerMessage",method= RequestMethod.POST)
81
     @RequestMapping(value="/taCustomerMessage",method= RequestMethod.POST)
81
-    public ResponseBean taCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage){
82
+    public ResponseBean taCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage, HttpServletRequest request){
82
         ResponseBean responseBean = new ResponseBean();
83
         ResponseBean responseBean = new ResponseBean();
83
         try {
84
         try {
85
+            taCustomerMessage.setOrgId(getOrgId(request));
84
             if (iTaCustomerMessageService.save(taCustomerMessage)){
86
             if (iTaCustomerMessageService.save(taCustomerMessage)){
85
                 responseBean.addSuccess(taCustomerMessage);
87
                 responseBean.addSuccess(taCustomerMessage);
86
             }else {
88
             }else {
124
      */
126
      */
125
     @RequestMapping(value="/taCustomerMessage/{id}",method= RequestMethod.PUT)
127
     @RequestMapping(value="/taCustomerMessage/{id}",method= RequestMethod.PUT)
126
     public ResponseBean taCustomerMessageUpdate(@PathVariable Integer id,
128
     public ResponseBean taCustomerMessageUpdate(@PathVariable Integer id,
127
-                                        @RequestBody TaCustomerMessage taCustomerMessage){
129
+                                                @RequestBody TaCustomerMessage taCustomerMessage,
130
+                                                HttpServletRequest request){
128
         ResponseBean responseBean = new ResponseBean();
131
         ResponseBean responseBean = new ResponseBean();
129
         try {
132
         try {
133
+            taCustomerMessage.setOrgId(getOrgId(request));
130
             if (iTaCustomerMessageService.updateById(taCustomerMessage)){
134
             if (iTaCustomerMessageService.updateById(taCustomerMessage)){
131
                 responseBean.addSuccess(taCustomerMessage);
135
                 responseBean.addSuccess(taCustomerMessage);
132
             }else {
136
             }else {

+ 8
- 5
src/main/java/com/huiju/estateagents/controller/TaNewsController.java 查看文件

63
      * @return
63
      * @return
64
      */
64
      */
65
     @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
65
     @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
66
-    public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
66
+    public ResponseBean taNewsList(HttpServletRequest request,
67
+                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
67
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
68
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
68
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
69
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
69
-                                   @RequestParam(value = "orgId", required = false) Integer orgId,
70
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
70
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
71
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
71
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
72
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
72
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus);
73
         return responseBean;
73
         return responseBean;
74
     }
74
     }
75
 
75
 
109
      * @return
109
      * @return
110
      */
110
      */
111
     @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
111
     @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
112
-    public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
112
+    public ResponseBean taNewsAdd(@RequestBody TaNews taNews, HttpServletRequest request){
113
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
113
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
114
         taNews.setCityId(cityId);
114
         taNews.setCityId(cityId);
115
+        taNews.setOrgId(getOrgId(request));
115
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
116
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
116
         return responseBean;
117
         return responseBean;
117
     }
118
     }
135
      */
136
      */
136
     @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.PUT)
137
     @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.PUT)
137
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
138
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
138
-                                        @RequestBody TaNews taNews){
139
+                                        @RequestBody TaNews taNews,
140
+                                     HttpServletRequest request){
139
         taNews.setNewsId(id);
141
         taNews.setNewsId(id);
140
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
142
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
141
         taNews.setCityId(cityId);
143
         taNews.setCityId(cityId);
144
+        taNews.setOrgId(getOrgId(request));
142
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
145
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
143
         return responseBean;
146
         return responseBean;
144
     }
147
     }

+ 8
- 5
src/main/java/com/huiju/estateagents/controller/TaNewsTypeController.java 查看文件

18
 import org.springframework.web.bind.annotation.ResponseBody;
18
 import org.springframework.web.bind.annotation.ResponseBody;
19
 import org.springframework.web.bind.annotation.RestController;
19
 import org.springframework.web.bind.annotation.RestController;
20
 
20
 
21
+import javax.servlet.http.HttpServletRequest;
22
+
21
 /**
23
 /**
22
  * <p>
24
  * <p>
23
     * 资讯类型表  前端控制器
25
     * 资讯类型表  前端控制器
46
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
48
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
49
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
48
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
50
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
49
-                                       @RequestParam(value = "orgId", required = false) Integer orgId){
50
-        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, orgId);
51
+                                       HttpServletRequest request){
52
+        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request));
51
         return responseBean;
53
         return responseBean;
52
     }
54
     }
53
 
55
 
57
      * @return
59
      * @return
58
      */
60
      */
59
     @RequestMapping(value="/admin/taNewsType",method= RequestMethod.POST)
61
     @RequestMapping(value="/admin/taNewsType",method= RequestMethod.POST)
60
-    public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType){
61
-        ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType);
62
+    public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType, HttpServletRequest request){
63
+        ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType, getOrgId(request));
62
         return responseBean;
64
         return responseBean;
63
     }
65
     }
64
 
66
 
81
      */
83
      */
82
     @RequestMapping(value="/admin/taNewsType/{id}",method= RequestMethod.PUT)
84
     @RequestMapping(value="/admin/taNewsType/{id}",method= RequestMethod.PUT)
83
     public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
85
     public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
84
-                                        @RequestBody TaNewsType taNewsType){
86
+                                        @RequestBody TaNewsType taNewsType, HttpServletRequest request){
85
         taNewsType.setNewsTypeId(id);
87
         taNewsType.setNewsTypeId(id);
88
+        taNewsType.setOrgId(getOrgId(request));
86
         ResponseBean responseBean = iTaNewsTypeService.updateTaNewsType(taNewsType);
89
         ResponseBean responseBean = iTaNewsTypeService.updateTaNewsType(taNewsType);
87
         return responseBean;
90
         return responseBean;
88
     }
91
     }

+ 5
- 1
src/main/java/com/huiju/estateagents/controller/TaPolicyController.java 查看文件

55
     @RequestMapping(value="/admin/taPolicy",method= RequestMethod.GET)
55
     @RequestMapping(value="/admin/taPolicy",method= RequestMethod.GET)
56
     public ResponseBean taPolicyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
56
     public ResponseBean taPolicyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
57
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
57
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
58
-                                     @RequestParam(value ="cityId") Integer cityId){
58
+                                     @RequestParam(value ="cityId", required = false) Integer cityId,
59
+                                     HttpServletRequest request){
59
         ResponseBean responseBean = new ResponseBean();
60
         ResponseBean responseBean = new ResponseBean();
60
         try {
61
         try {
61
             //使用分页插件
62
             //使用分页插件
64
             queryWrapper.eq(null != cityId,"city_id",cityId);
65
             queryWrapper.eq(null != cityId,"city_id",cityId);
65
             queryWrapper.orderByDesc("weight", "create_date");
66
             queryWrapper.orderByDesc("weight", "create_date");
66
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
67
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
68
+            queryWrapper.eq("org_id", getOrgId(request));
67
 
69
 
68
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
70
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
69
             responseBean.addSuccess(result);
71
             responseBean.addSuccess(result);
124
 
126
 
125
             taPolicy.setStatus(1);
127
             taPolicy.setStatus(1);
126
             taPolicy.setCreateDate(LocalDateTime.now());
128
             taPolicy.setCreateDate(LocalDateTime.now());
129
+            taPolicy.setOrgId(getOrgId(request));
127
 
130
 
128
             if (iTaPolicyService.save(taPolicy)){
131
             if (iTaPolicyService.save(taPolicy)){
129
                 responseBean.addSuccess(taPolicy);
132
                 responseBean.addSuccess(taPolicy);
182
 
185
 
183
             TdCity tdCity = iTdCityService.getById(taPolicy.getCityId());
186
             TdCity tdCity = iTdCityService.getById(taPolicy.getCityId());
184
             taPolicy.setCityName(tdCity.getName());
187
             taPolicy.setCityName(tdCity.getName());
188
+            taPolicy.setOrgId(getOrgId(request));
185
 
189
 
186
             if (iTaPolicyService.updateById(taPolicy)){
190
             if (iTaPolicyService.updateById(taPolicy)){
187
                 responseBean.addSuccess(taPolicy);
191
                 responseBean.addSuccess(taPolicy);

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java 查看文件

215
 
215
 
216
     // 客户列表 公客/私客
216
     // 客户列表 公客/私客
217
     @GetMapping("/admin/customer/recommend")
217
     @GetMapping("/admin/customer/recommend")
218
-    public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
218
+    public ResponseBean getCustomerList (HttpServletRequest request,
219
+                                         @RequestParam(value ="name",required = false) String name,
219
                                          @RequestParam(value ="tel",required = false) String tel,
220
                                          @RequestParam(value ="tel",required = false) String tel,
220
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
221
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
221
                                          @RequestParam(value ="consultName",required = false) String consultName,
222
                                          @RequestParam(value ="consultName",required = false) String consultName,
227
                                          @RequestParam(value = "sex",required = false)Integer sex,
228
                                          @RequestParam(value = "sex",required = false)Integer sex,
228
                                          @RequestParam(value = "customerType") String customerType){ // public 公  private 私
229
                                          @RequestParam(value = "customerType") String customerType){ // public 公  private 私
229
         try{
230
         try{
230
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, null)); //getOrgId(request)
231
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
231
         }catch (Exception e){
232
         }catch (Exception e){
232
             e.printStackTrace();
233
             e.printStackTrace();
233
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
234
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

+ 8
- 4
src/main/java/com/huiju/estateagents/controller/TdBizEventController.java 查看文件

18
 import org.springframework.web.bind.annotation.RestController;
18
 import org.springframework.web.bind.annotation.RestController;
19
 import com.huiju.estateagents.base.BaseController;
19
 import com.huiju.estateagents.base.BaseController;
20
 
20
 
21
+import javax.servlet.http.HttpServletRequest;
22
+
21
 /**
23
 /**
22
  * <p>
24
  * <p>
23
     * 事件字典  前端控制器
25
     * 事件字典  前端控制器
44
      */
46
      */
45
     @RequestMapping(value="/admin/tdBizEvent",method= RequestMethod.GET)
47
     @RequestMapping(value="/admin/tdBizEvent",method= RequestMethod.GET)
46
     public ResponseBean tdBizEventList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
48
     public ResponseBean tdBizEventList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
49
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
50
+                                       HttpServletRequest request){
48
         ResponseBean responseBean = new ResponseBean();
51
         ResponseBean responseBean = new ResponseBean();
49
         try {
52
         try {
50
             //使用分页插件
53
             //使用分页插件
70
      */
73
      */
71
     @RequestMapping(value="/admin/tdBizEventIntention",method= RequestMethod.GET)
74
     @RequestMapping(value="/admin/tdBizEventIntention",method= RequestMethod.GET)
72
     public ResponseBean tdBizEventAndIntention(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
75
     public ResponseBean tdBizEventAndIntention(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
73
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
74
-                                            @RequestParam(value = "buildingId", required = false) String buildingId){
76
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
77
+                                               @RequestParam(value = "buildingId", required = false) String buildingId,
78
+                                               HttpServletRequest request){
75
         ResponseBean responseBean = new ResponseBean();
79
         ResponseBean responseBean = new ResponseBean();
76
         try {
80
         try {
77
             //使用分页插件
81
             //使用分页插件
78
             IPage<TdBizEvent> pg = new Page<>(pageNum, pageSize);
82
             IPage<TdBizEvent> pg = new Page<>(pageNum, pageSize);
79
-            responseBean = iTdBizEventService.getBizEventAndIntention(pg, buildingId);
83
+            responseBean = iTdBizEventService.getBizEventAndIntention(pg, buildingId, getOrgId(request));
80
         }catch (Exception e){
84
         }catch (Exception e){
81
             logger.error("tdBizEventList -=- {}",e.toString());
85
             logger.error("tdBizEventList -=- {}",e.toString());
82
             responseBean.addError(e.getMessage());
86
             responseBean.addError(e.getMessage());

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaActivityDynamicEnlistMapper.java 查看文件

25
      * @param dynamicId
25
      * @param dynamicId
26
      * @return
26
      * @return
27
      */
27
      */
28
-    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId);
28
+    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId);
29
 }
29
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TdBizEventMapper.java 查看文件

26
      * @param buildingId
26
      * @param buildingId
27
      * @return
27
      * @return
28
      */
28
      */
29
-    IPage<TdBizEvent> selectBizEventAndIntention(IPage<TdBizEvent> pg, @Param("buildingId") String buildingId);
29
+    IPage<TdBizEvent> selectBizEventAndIntention(IPage<TdBizEvent> pg, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId);
30
 }
30
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java 查看文件

79
      * @param page
79
      * @param page
80
      * @return
80
      * @return
81
      */
81
      */
82
-    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId);
82
+    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId);
83
 
83
 
84
     IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
84
     IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
85
 
85
 

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingIntentionService.java 查看文件

23
      * @param tdBizEventsList
23
      * @param tdBizEventsList
24
      * @return
24
      * @return
25
      */
25
      */
26
-    ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent> tdBizEventsList, String buildingId);
26
+    ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent> tdBizEventsList, String buildingId, Integer orgId);
27
 }
27
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaNewsTypeService.java 查看文件

43
      * @param taNewsType
43
      * @param taNewsType
44
      * @return
44
      * @return
45
      */
45
      */
46
-    ResponseBean addTaNewsType(TaNewsType taNewsType);
46
+    ResponseBean addTaNewsType(TaNewsType taNewsType, Integer orgId);
47
 
47
 
48
     /**
48
     /**
49
      * 删除资讯类型
49
      * 删除资讯类型

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITdBizEventService.java 查看文件

22
      * @param buildingId
22
      * @param buildingId
23
      * @return
23
      * @return
24
      */
24
      */
25
-    ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId);
25
+    ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId, Integer orgId);
26
 
26
 
27
 }
27
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java 查看文件

245
     }
245
     }
246
 
246
 
247
     @Override
247
     @Override
248
-    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId) {
249
-        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId);
248
+    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId, Integer orgId) {
249
+        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId, orgId);
250
         return ResponseBean.success(signList);
250
         return ResponseBean.success(signList);
251
     }
251
     }
252
 
252
 

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingIntentionServiceImpl.java 查看文件

27
     private TaBuildingIntentionMapper taBuildingIntentionMapper;
27
     private TaBuildingIntentionMapper taBuildingIntentionMapper;
28
 
28
 
29
     @Override
29
     @Override
30
-    public ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent>tdBizEventsList, String buildingId) {
30
+    public ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent>tdBizEventsList, String buildingId, Integer orgId) {
31
         ResponseBean responseBean = new ResponseBean();
31
         ResponseBean responseBean = new ResponseBean();
32
 
32
 
33
         // 先删除库中存在的
33
         // 先删除库中存在的
45
                 taBuildingIntention.setCreateDate(e.getCreateDate());
45
                 taBuildingIntention.setCreateDate(e.getCreateDate());
46
                 taBuildingIntention.setBuildingId(buildingId);
46
                 taBuildingIntention.setBuildingId(buildingId);
47
                 taBuildingIntention.setStatus(1);
47
                 taBuildingIntention.setStatus(1);
48
+                taBuildingIntention.setOrgId(orgId);
48
                 return taBuildingIntention;
49
                 return taBuildingIntention;
49
         }).collect(Collectors.toList());
50
         }).collect(Collectors.toList());
50
 
51
 

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java 查看文件

203
         if (CollectionUtils.isNotEmpty(buildingImgs)) {
203
         if (CollectionUtils.isNotEmpty(buildingImgs)) {
204
             QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
204
             QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
205
             buildingIdQueryWrapper.eq("building_id", building.getBuildingId());
205
             buildingIdQueryWrapper.eq("building_id", building.getBuildingId());
206
+            buildingIdQueryWrapper.eq("org_id", orgId);
206
             taBuildingMapper.update(building,buildingIdQueryWrapper);
207
             taBuildingMapper.update(building,buildingIdQueryWrapper);
207
             QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
208
             QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
208
             BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
209
             BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java 查看文件

81
     }
81
     }
82
 
82
 
83
     @Override
83
     @Override
84
-    public ResponseBean addTaNewsType(TaNewsType taNewsType) {
84
+    public ResponseBean addTaNewsType(TaNewsType taNewsType, Integer orgId) {
85
         ResponseBean responseBean = new ResponseBean();
85
         ResponseBean responseBean = new ResponseBean();
86
 
86
 
87
         //-- 校验 公司,楼盘
87
         //-- 校验 公司,楼盘
89
 
89
 
90
         taNewsType.setCreateDate(LocalDateTime.now());
90
         taNewsType.setCreateDate(LocalDateTime.now());
91
         taNewsType.setStatus(1);
91
         taNewsType.setStatus(1);
92
+        taNewsType.setOrgId(orgId);
92
         this.save(taNewsType);
93
         this.save(taNewsType);
93
         responseBean.addSuccess(taNewsType);
94
         responseBean.addSuccess(taNewsType);
94
         return responseBean;
95
         return responseBean;

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java 查看文件

395
         queryWrapper.eq("recommend_person",customerId);
395
         queryWrapper.eq("recommend_person",customerId);
396
 //        queryWrapper.eq("building_id",building);
396
 //        queryWrapper.eq("building_id",building);
397
         queryWrapper.eq("status", CommConstant.VERIFY_AGREE);
397
         queryWrapper.eq("status", CommConstant.VERIFY_AGREE);
398
+        queryWrapper.eq("org_id", orgId);
398
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
399
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
399
         return taRecommendCustomerMapper.selectPage(page,queryWrapper);
400
         return taRecommendCustomerMapper.selectPage(page,queryWrapper);
400
     }
401
     }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TdBizEventServiceImpl.java 查看文件

26
     private TdBizEventMapper tdBizEventMapper;
26
     private TdBizEventMapper tdBizEventMapper;
27
 
27
 
28
     @Override
28
     @Override
29
-    public ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId) {
29
+    public ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId, Integer orgId) {
30
         ResponseBean responseBean = new ResponseBean();
30
         ResponseBean responseBean = new ResponseBean();
31
-        IPage<TdBizEvent> page = tdBizEventMapper.selectBizEventAndIntention(pg, buildingId);
31
+        IPage<TdBizEvent> page = tdBizEventMapper.selectBizEventAndIntention(pg, buildingId, orgId);
32
         responseBean.addSuccess(page);
32
         responseBean.addSuccess(page);
33
         return responseBean;
33
         return responseBean;
34
     }
34
     }

+ 1
- 1
src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml 查看文件

2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
 <mapper namespace="com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper">
3
 <mapper namespace="com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper">
4
         <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
4
         <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
5
-            select * from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId}
5
+            select * from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
6
         </select>
6
         </select>
7
 </mapper>
7
 </mapper>

+ 3
- 0
src/main/resources/mapper/TdBizEventMapper.xml 查看文件

25
                 <if test="buildingId != null and buildingId != ''">
25
                 <if test="buildingId != null and buildingId != ''">
26
                     tbi.building_id = #{buildingId}
26
                     tbi.building_id = #{buildingId}
27
                 </if>
27
                 </if>
28
+                <if test="orgId != null">
29
+                    and tbi.org_id = #{orgId}
30
+                </if>
28
             </trim>
31
             </trim>
29
         ) as building_intention
32
         ) as building_intention
30
 
33