bug

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

@@ -134,6 +134,31 @@ public class TaBuildingDynamicController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "后台管理端查询项目活动列表", notes = "后台管理端查询项目活动列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "name", paramType = "query",value = "项目名称"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "isEnlist", paramType = "query",value = "是否报名"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "time", paramType = "query",value = "日期")
+    })
+    @RequestMapping(value = "/admin/iBuildingDynamicSelected", method = RequestMethod.GET)
+    public ResponseBean iBuildingDynamicSelectedList(@RequestParam("pageNum")Integer pageNum,
+                                             @RequestParam("pageSize")Integer pageSize,
+                                             @RequestParam(required = false)String name,
+                                             @RequestParam(required = false)Integer cityId,
+                                             @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,
+                                             @RequestParam(required = false)String activityStatus,HttpServletRequest request){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectedList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus);
+        return responseBean;
+    }
+
     @RequestMapping(value = "/admin/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") String id, HttpSession session){
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);

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

@@ -86,4 +86,6 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * 更新结束的活动
      */
     void updateProcessingActivity();
+
+    IPage<TaBuildingDynamic> iBuildingDynamicSelectedList(Page<TaBuildingDynamic> page, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus);
 }

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

@@ -123,4 +123,20 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @return
      */
     List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(int i, Integer pageSize, String dynamicId, String isCheckin, String name, String phone,Integer orgId);
+
+    /**
+     * 下拉选框数据
+     * @param pageNum
+     * @param pageSize
+     * @param name
+     * @param buildingId
+     * @param cityId
+     * @param isEnlist
+     * @param time
+     * @param title
+     * @param orgId
+     * @param activityStatus
+     * @return
+     */
+    ResponseBean iBuildingDynamicSelectedList(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/impl/TaBuildingDynamicServiceImpl.java

@@ -367,6 +367,37 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         return taActivityDynamicEnlistMapper.getTaActivityDynamicEnlistExport(i,pageSize,dynamicId,isCheckin,name,phone,orgId);
     }
 
+    /**
+     * 下拉选框数据
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param name
+     * @param buildingId
+     * @param cityId
+     * @param isEnlist
+     * @param time
+     * @param title
+     * @param orgId
+     * @param activityStatus
+     * @return
+     */
+    @Override
+    public ResponseBean iBuildingDynamicSelectedList(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.iBuildingDynamicSelectedList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus);
+
+        HashMap hashMap= new HashMap<>();
+        hashMap.put("list",buildingDynamic.getRecords());
+        hashMap.put("total",buildingDynamic.getTotal());
+        hashMap.put("pageNum",buildingDynamic.getCurrent());
+        hashMap.put("pageSize",buildingDynamic.getSize());
+        return ResponseBean.success(hashMap);
+    }
+
     @Override
     public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -48,6 +48,38 @@
         ORDER BY tbd.heavy DESC
   </select>
 
+    <select id="iBuildingDynamicSelectedList" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">
+        select
+        *,
+        (select sum(tade.attend_num) from ta_activity_dynamic_enlist tade where tade.dynamic_id = tbd.dynamic_id ) as count
+        from ta_building_dynamic tbd where tbd.status = 1
+        <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>
+        <if test="isEnlist != null and isEnlist !=''">
+            and tbd.is_enlist = #{isEnlist}
+        </if>
+        <if test="cityId != 0 and cityId != null">
+            and tbd.city_id = #{cityId}
+        </if>
+        <if test="title != null and title != ''">
+            and tbd.title like CONCAT('%', #{title} , '%')
+        </if>
+        <if test="orgId != null and orgId != ''">
+            and tbd.org_id = #{orgId}
+        </if>
+        <if test="time != null">
+            and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
+        </if>
+        ORDER BY tbd.heavy DESC
+    </select>
+
     <select id="iBuildingDynamicSelectId" parameterType="string" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">
       SELECT
             dynamic_id,