胡轶钦 5 years ago
parent
commit
0d25b228fe

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/StatisticalController.java View File

89
      * 行为分析的 具体数据列表
89
      * 行为分析的 具体数据列表
90
      * @return
90
      * @return
91
      */
91
      */
92
-    @GetMapping(value = "/selectConversion")
92
+    @GetMapping(value = "/selectConversion/activity")
93
     public ResponseBean selectConversionAll(@RequestParam(value = "conversion") String conversion) {
93
     public ResponseBean selectConversionAll(@RequestParam(value = "conversion") String conversion) {
94
         return iStatisticalService.selectConversion(conversion);
94
         return iStatisticalService.selectConversion(conversion);
95
     }
95
     }

+ 2
- 0
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java View File

9
 import com.huiju.estateagents.service.ITaBuildingService;
9
 import com.huiju.estateagents.service.ITaBuildingService;
10
 import com.huiju.estateagents.service.ITaPersonService;
10
 import com.huiju.estateagents.service.ITaPersonService;
11
 import com.huiju.estateagents.service.ITaSaveService;
11
 import com.huiju.estateagents.service.ITaSaveService;
12
+import com.huiju.estateagents.service.ITdCityService;
12
 import org.springframework.beans.factory.annotation.Autowired;
13
 import org.springframework.beans.factory.annotation.Autowired;
13
 import org.springframework.web.bind.annotation.*;
14
 import org.springframework.web.bind.annotation.*;
14
 
15
 
39
     @Autowired
40
     @Autowired
40
     ITaPersonService iTaPersonService;
41
     ITaPersonService iTaPersonService;
41
 
42
 
43
+
42
     /**
44
     /**
43
      * 楼盘详情
45
      * 楼盘详情
44
      * @param id
46
      * @param id

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TdCityController.java View File

4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.huiju.estateagents.base.ResponseBean;
6
 import com.huiju.estateagents.base.ResponseBean;
7
+import com.huiju.estateagents.common.CommConstant;
7
 import com.huiju.estateagents.entity.TdCity;
8
 import com.huiju.estateagents.entity.TdCity;
8
 import com.huiju.estateagents.service.ITdCityService;
9
 import com.huiju.estateagents.service.ITdCityService;
9
 import org.slf4j.Logger;
10
 import org.slf4j.Logger;
46
     public ResponseBean tdCityList(@RequestParam(value = "leveltype", required = false) String leveltype){
47
     public ResponseBean tdCityList(@RequestParam(value = "leveltype", required = false) String leveltype){
47
         ResponseBean responseBean = new ResponseBean();
48
         ResponseBean responseBean = new ResponseBean();
48
         try {
49
         try {
49
-            List<TdCity> result = iTdCityService.selectCity(leveltype);
50
+            List<TdCity> result = iTdCityService.selectCity(leveltype,"");
50
             responseBean.addSuccess(result);
51
             responseBean.addSuccess(result);
51
         }catch (Exception e){
52
         }catch (Exception e){
52
             logger.error("tdCityList -=- {}",e.toString());
53
             logger.error("tdCityList -=- {}",e.toString());
63
     public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype){
64
     public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype){
64
         ResponseBean responseBean = new ResponseBean();
65
         ResponseBean responseBean = new ResponseBean();
65
         try {
66
         try {
66
-            List<TdCity> result = iTdCityService.selectCity(leveltype);
67
+            List<TdCity> result = iTdCityService.selectCity(leveltype, "1");
67
             responseBean.addSuccess(result);
68
             responseBean.addSuccess(result);
68
         }catch (Exception e){
69
         }catch (Exception e){
69
             logger.error("tdCityList -=- {}",e.toString());
70
             logger.error("tdCityList -=- {}",e.toString());

+ 15
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java View File

7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.common.CommConstant;
8
 import com.huiju.estateagents.common.CommConstant;
9
 import com.huiju.estateagents.common.DateUtils;
9
 import com.huiju.estateagents.common.DateUtils;
10
+import com.huiju.estateagents.common.StringUtils;
10
 import com.huiju.estateagents.entity.*;
11
 import com.huiju.estateagents.entity.*;
11
 import com.huiju.estateagents.mapper.*;
12
 import com.huiju.estateagents.mapper.*;
12
 import com.huiju.estateagents.service.ITaBuildingService;
13
 import com.huiju.estateagents.service.ITaBuildingService;
13
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
14
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
15
+import org.checkerframework.checker.units.qual.A;
14
 import org.springframework.beans.factory.annotation.Autowired;
16
 import org.springframework.beans.factory.annotation.Autowired;
15
 import org.springframework.stereotype.Service;
17
 import org.springframework.stereotype.Service;
16
 
18
 
57
     @Autowired
59
     @Autowired
58
     TaPersonMapper taPersonMapper;
60
     TaPersonMapper taPersonMapper;
59
 
61
 
62
+    @Autowired
63
+    TdCityMapper tdCityMapper;
64
+
60
 
65
 
61
     @Override
66
     @Override
62
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code) {
67
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code) {
162
         BuildingTagQueryWrapper.eq("building_id", building.getBuildingId());
167
         BuildingTagQueryWrapper.eq("building_id", building.getBuildingId());
163
         taBuildingTagMapper.delete(BuildingTagQueryWrapper);
168
         taBuildingTagMapper.delete(BuildingTagQueryWrapper);
164
         insertTagBatch(buildingTags, building.getBuildingId());
169
         insertTagBatch(buildingTags, building.getBuildingId());
165
-
170
+        if(null != building.getCityId()){
171
+            TdCity city = tdCityMapper.selectById(building.getCityId());
172
+            city.setStatus("1");
173
+            tdCityMapper.updateById(city);
174
+        }
166
         return ResponseBean.success("");
175
         return ResponseBean.success("");
167
     }
176
     }
168
 
177
 
182
         if (taBuildingMapper.insert(building) < 1) {
191
         if (taBuildingMapper.insert(building) < 1) {
183
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
192
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
184
         }
193
         }
194
+        if(null != building.getCityId()){
195
+            TdCity city = tdCityMapper.selectById(building.getCityId());
196
+            city.setStatus("1");
197
+            tdCityMapper.updateById(city);
198
+        }
185
 
199
 
186
         String imgStr = object.getString("img");
200
         String imgStr = object.getString("img");
187
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
201
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);