胡轶钦 5 年 前
コミット
0d25b228fe

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/StatisticalController.java ファイルの表示

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

+ 2
- 0
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java ファイルの表示

@@ -9,6 +9,7 @@ import com.huiju.estateagents.entity.TaPerson;
9 9
 import com.huiju.estateagents.service.ITaBuildingService;
10 10
 import com.huiju.estateagents.service.ITaPersonService;
11 11
 import com.huiju.estateagents.service.ITaSaveService;
12
+import com.huiju.estateagents.service.ITdCityService;
12 13
 import org.springframework.beans.factory.annotation.Autowired;
13 14
 import org.springframework.web.bind.annotation.*;
14 15
 
@@ -39,6 +40,7 @@ public class TaBuildingController extends BaseController {
39 40
     @Autowired
40 41
     ITaPersonService iTaPersonService;
41 42
 
43
+
42 44
     /**
43 45
      * 楼盘详情
44 46
      * @param id

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TdCityController.java ファイルの表示

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

+ 15
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java ファイルの表示

@@ -7,10 +7,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8 8
 import com.huiju.estateagents.common.CommConstant;
9 9
 import com.huiju.estateagents.common.DateUtils;
10
+import com.huiju.estateagents.common.StringUtils;
10 11
 import com.huiju.estateagents.entity.*;
11 12
 import com.huiju.estateagents.mapper.*;
12 13
 import com.huiju.estateagents.service.ITaBuildingService;
13 14
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
15
+import org.checkerframework.checker.units.qual.A;
14 16
 import org.springframework.beans.factory.annotation.Autowired;
15 17
 import org.springframework.stereotype.Service;
16 18
 
@@ -57,6 +59,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
57 59
     @Autowired
58 60
     TaPersonMapper taPersonMapper;
59 61
 
62
+    @Autowired
63
+    TdCityMapper tdCityMapper;
64
+
60 65
 
61 66
     @Override
62 67
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code) {
@@ -162,7 +167,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
162 167
         BuildingTagQueryWrapper.eq("building_id", building.getBuildingId());
163 168
         taBuildingTagMapper.delete(BuildingTagQueryWrapper);
164 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 175
         return ResponseBean.success("");
167 176
     }
168 177
 
@@ -182,6 +191,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
182 191
         if (taBuildingMapper.insert(building) < 1) {
183 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 200
         String imgStr = object.getString("img");
187 201
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);