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

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

                                              @RequestParam(required = false)String buildingId,
                                              @RequestParam(required = false)String title,
                                              @RequestParam(required = false)String isEnlist,
-                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,HttpServletRequest request){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request));
+                                             @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);
         return responseBean;
     }
 

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

                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @RequestParam(value ="cityId",required = false)Integer cityId,
                                             @RequestParam(value ="buildingId",required = false)String buildingId,
+                                            @RequestParam(value ="status",required = false)Integer status,
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request));
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
+import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.swagger.models.auth.In;
     @Autowired
     private ITaDrainageRecordService iTaDrainageRecordService;
 
+    @Autowired
+    public IExtendContentService iExtendContentService;
+
     /**
      * 分页查询列表
      * @param pageNum
         ResponseBean responseBean = new ResponseBean();
         try {
             taDrainage.setDrainageId(id);
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",taDrainage.getOrgId());
+            queryWrapper.eq("content_type",CommConstant.EVENT_H5);
+            queryWrapper.eq("target_id",taDrainage.getDrainageId());
+            List<ExtendContent> list = iExtendContentService.list(queryWrapper);
             if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)){
                 taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
+                //如果H5有被轮播图或开屏广告选中则轮播图和开屏广告都要下架
+                list.forEach(e -> {
+                    e.setStatus(CommConstant.STATUS_UNACCALIMED);
+                });
             }else{
                 if (taDrainage.getEndDate().isBefore(LocalDateTime.now())){
                     responseBean.addError("已过下架时间，无法上架");
                     return responseBean;
                 }
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
+                //如果H5有被轮播图或开屏广告选中则轮播图和开屏广告都要上架
+                list.forEach(e -> {
+                    e.setStatus(CommConstant.STATUS_NORMAL);
+                });
+            }
+            if (list.size() > 0){
+                iExtendContentService.updateBatchById(list);
             }
             if (iTaDrainageService.updateById(taDrainage)){
                 responseBean.addSuccess(taDrainage);

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

      * 分享者userId
      */
     @TableField(exist = false)
-    private Integer sharePersonId;
+    private String sharePersonId;
 
     /**
      * 分享者名称

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

 import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Map;
 
 /**
     /**
      * 会员列列表
      * @param page
+     * @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);
+    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);
 
     /**
      * 详情

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

      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus);
 
     /**
      * 项目详情

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

      * @param orgId
      * @return
      */
-    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId);
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status);
 
     Integer countGroupBuyPeople(TaShareActivity taShareActivity);
 }

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

         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) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus) {
         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);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus);
 
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingDynamic.getRecords());

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

     }
 
     @Override
-    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId) {
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         QueryWrapper<TaShareActivity> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("activity_status", 0, 1);
         queryWrapper.eq(orgId != null, "org_id", orgId);
+        queryWrapper.eq(status != null, "status", status);
         queryWrapper.eq(cityId != null, "city_id", cityId);
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
         queryWrapper.orderByAsc("activity_status");

src/main/resources/mapper/TaBuildingDynamicMapper.xml

         <if test="name != null and name !=''">
             and tbd.title like CONCAT('%', #{name} , '%')
         </if>
+        <if test="activityStatus != null and activityStatus !=''">
+            and tbd.activity_status != #{activityStatus}
+        </if>
         <if test="buildingId != null and buildingId !=''">
             and tbd.building_id = #{buildingId}
         </if>

src/main/resources/mapper/TaBuildingMapper.xml

     <select id="buildingList" resultType="com.huiju.estateagents.entity.TaBuilding">
         SELECT * FROM ta_building
         <where>
-            status > 0
+            status = 1
             <if test="Name != null and Name != ''">
                 and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
             </if>