Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

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

 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
 import org.springframework.beans.factory.annotation.Autowired;
     @Autowired
     private ITaSaveService taSaveService;
 
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
     public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
+        dynamic.setCityId(cityId);
         dynamic.setStatus(1);
 //        dynamic.setDynamicId(idGen.nextId()+"");
         dynamic.setPublishDate(LocalDateTime.now());
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
+        dynamic.setCityId(cityId);
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
         return responseBean;

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

 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaNewsService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
     @Autowired
     public ITaSaveService iTaSaveService;
 
+    @Autowired
+    public ITaBuildingService iTaBuildingService;
+
 
     /**
      * 分页查询列表
      */
     @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
     public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
+        Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
+        taNews.setCityId(cityId);
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
         return responseBean;
     }
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
                                         @RequestBody TaNews taNews){
         taNews.setNewsId(id);
+        Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
+        taNews.setCityId(cityId);
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
         return responseBean;
     }

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

      * 活动报名人数
      */
     private Integer enlistNum;
+
+    private Integer weight;
 }

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

         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
-        buildingDynamicQueryWrapper.orderByDesc("create_date");
+        buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）