楼盘相关调整

src/main/java/com/yunzhi/marketing/controller/TaBuildingDynamicController.java

@@ -123,10 +123,11 @@ public class TaBuildingDynamicController extends BaseController {
                                              @RequestParam(required = false)Integer cityId,
                                              @RequestParam(required = false)String buildingId,
                                              @RequestParam(required = false)String title,
+                                             @RequestParam(required = false)String type,
                                              @RequestParam(required = false)String isEnlist,
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,
                                              @RequestParam(required = false)String activityStatus, HttpServletRequest request){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus,getTaPersonBuildingListByUserId(request));
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus,getTaPersonBuildingListByUserId(request),type);
         return responseBean;
     }
 
@@ -178,6 +179,7 @@ public class TaBuildingDynamicController extends BaseController {
     })
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
+                                                @RequestParam(value = "type", required = false) String type,
                                                @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                @RequestParam(defaultValue = "false" )boolean mine,
@@ -194,7 +196,7 @@ public class TaBuildingDynamicController extends BaseController {
             TaPerson person = taPersons.get(0);
             responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
         }else {
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId,type);
         }
 
         return responseBean;

src/main/java/com/yunzhi/marketing/entity/TaBuildingDynamic.java

@@ -231,4 +231,6 @@ public class TaBuildingDynamic implements Serializable {
      */
     @TableField(exist = false)
     private Integer enlisted;
+
+    private String type;
 }

src/main/java/com/yunzhi/marketing/mapper/TaBuildingDynamicMapper.java

@@ -30,7 +30,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @param selected
      * @return
      */
-    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);
+    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,@Param("type") String type);
 
     /**
      * 详情

src/main/java/com/yunzhi/marketing/service/ITaBuildingDynamicService.java

@@ -28,7 +28,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    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);
+    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,String type);
 
     /**
      * 项目详情
@@ -41,7 +41,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId,String type);
 
     /**
      * 微信小程序 项目详情

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingDynamicServiceImpl.java

@@ -73,12 +73,14 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    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) {
+    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,
+                                             String type) {
         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,cityId,isEnlist,time,title,orgId,activityStatus,personBuildingList);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus,personBuildingList,type);
 
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingDynamic.getRecords());
@@ -95,7 +97,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId,String type) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
@@ -109,6 +111,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
         buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
+        buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(type),"type",type);
         buildingDynamicQueryWrapper.eq("org_id",orgId);
         buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -371,6 +371,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         // 添加楼盘特价房源
         LambdaQueryWrapper<BuildingSpecialRoom> specialRoomLambdaQueryWrapper = new LambdaQueryWrapper<>();
         specialRoomLambdaQueryWrapper.eq(BuildingSpecialRoom::getBuildingId,id);
+        LocalDateTime now = LocalDateTime.now();
+        specialRoomLambdaQueryWrapper.gt(BuildingSpecialRoom::getStartTime,now);
+        specialRoomLambdaQueryWrapper.lt(BuildingSpecialRoom::getEndTime,now);
         specialRoomLambdaQueryWrapper.orderByDesc(BuildingSpecialRoom::getCreateDate);
         List<BuildingSpecialRoom> buildingSpecialRooms = buildingSpecialRoomMapper.selectList(specialRoomLambdaQueryWrapper);
         building.setSpecialRoomList(buildingSpecialRooms);
@@ -378,7 +381,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         // 添加楼盘项目动态
         LambdaQueryWrapper<Trend> lambdaQueryWrapper =new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Trend::getBuildingId,id);
-        lambdaQueryWrapper.orderByDesc(Trend::getCreateDate);
+        lambdaQueryWrapper.orderByDesc(Trend::getTrendTime);
         List<Trend> trends = trendMapper.selectList(lambdaQueryWrapper);
         building.setTrendList(trends);
 

src/main/java/com/yunzhi/marketing/xlk/controller/TrendController.java

@@ -66,7 +66,7 @@ public class TrendController extends BaseController {
             LambdaQueryWrapper<Trend> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Trend::getOrgId,getOrgId(request));
             queryWrapper.eq(Trend::getBuildingId,buildingId);
-            queryWrapper.orderByDesc(Trend::getCreateDate);
+            queryWrapper.orderByDesc(Trend::getTrendTime);
 
             IPage<Trend> result = iTrendService.page(pg, queryWrapper);
             responseBean.addSuccess(result);

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -24,6 +24,9 @@
         <if test="name != null and name !=''">
             and tbd.title like CONCAT('%', #{name} , '%')
         </if>
+        <if test="type != null and type !=''">
+            and tbd.type = #{type}
+        </if>
         <if test="activityStatus != null and activityStatus !=''">
             and tbd.activity_status != #{activityStatus}
         </if>