cityId

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

@@ -156,6 +156,7 @@ public class TaBuildingController extends BaseController {
             @RequestParam(defaultValue = "1") Integer pageNum,
             @RequestParam(defaultValue = "10")Integer pageSize,
             @RequestParam(defaultValue = "false") Boolean mine,
+            @RequestParam(required = false) int cityId,
             String name,
             HttpServletRequest request
     ){
@@ -170,7 +171,7 @@ public class TaBuildingController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_PROJECT);
         }
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets);
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets,cityId);
     }
 
     /**

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -62,10 +62,11 @@ public class TaBuildingDynamicController extends BaseController {
     @RequestMapping(value = "/admin/iBuildingDynamicList", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
                                              @RequestParam("pageSize")Integer pageSize,
-                                             @RequestParam(required = false)String name ,
+                                             @RequestParam(required = false)String name,
+                                             @RequestParam(required = false)int cityId,
                                              @RequestParam(required = false)String buildingId,
                                              HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId);
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/controller/TaNewsController.java

@@ -78,6 +78,7 @@ public class TaNewsController extends BaseController {
     public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                      @RequestParam(required = false) String buildingId,
+                                     @RequestParam(required = false) int cityId,
                                      @RequestParam(defaultValue = "false") Boolean mine,
                                      HttpServletRequest request
     ){
@@ -92,7 +93,7 @@ public class TaNewsController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_NEWS);
         }
 
-        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets);
+        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId);
         return ResponseBean.success(results);
     }
 

src/main/java/com/huiju/estateagents/entity/TaApartmentImg.java

@@ -2,6 +2,8 @@ package com.huiju.estateagents.entity;
 
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,6 +26,7 @@ public class TaApartmentImg implements Serializable {
     /**
      * 户型id
      */
+    @TableId(value = "apartment_id", type = IdType.UUID)
     private String apartmentId;
 
     /**

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -217,4 +217,6 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<Map<String, Object>> consultants;
+
+    private int cityId;
 }

src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java

@@ -159,4 +159,6 @@ public class TaBuildingDynamic implements Serializable {
      * 活动人数
      */
     private  String personNum;
+
+    private int cityId;
 }

src/main/java/com/huiju/estateagents/entity/TaNews.java

@@ -101,4 +101,6 @@ public class TaNews implements Serializable {
      */
     @TableField(exist = false)
     private TaNewsType newsType;
+
+    private int cityId;
 }

src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java

@@ -24,7 +24,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @param page
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") int cityId);
 
     /**
      * 详情

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

@@ -22,7 +22,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,int cityId);
 
     /**
      * 项目详情

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -107,7 +107,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @param name
      */
-    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets);
+    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,int cityId);
 
     /**
      * 微信小程序 楼盘列表

src/main/java/com/huiju/estateagents/service/ITaNewsService.java

@@ -70,5 +70,5 @@ public interface ITaNewsService extends IService<TaNews> {
      */
     ResponseBean wxTaPvNum(Integer id);
 
-    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets);
+    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,int cityId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -64,12 +64,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,int cityId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId);
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -311,12 +311,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets) {
+    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,int cityId) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
         buildingQueryWrapper.nested(null != name && !"".equals(name.trim()), i -> i.like("name", name).or().like("building_name", name));
         buildingQueryWrapper.eq("status", 1);
+        buildingQueryWrapper.eq(cityId != 0,"city_id",cityId);
         buildingQueryWrapper.in(null != targets && targets.size() > 0, "building_id", targets);
 //        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
         buildingQueryWrapper.orderByAsc("order_no");

src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java

@@ -182,12 +182,13 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
     }
 
     @Override
-    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets) {
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,int cityId) {
         IPage<TaNews> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
         taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
         taNewsQueryWrapper.in(null != targets && targets.size() > 0, "news_id", targets);
+        taNewsQueryWrapper.eq(cityId != 0,"city_id",cityId);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -24,6 +24,9 @@
         <if test="buildingId != null and buildingId !=''">
             and building_id = #{buildingId}
         </if>
+        <if test="cityId != 0">
+            and city_id = #{cityId}
+        </if>
         ORDER BY create_date DESC
   </select>