傅行帆 5 år sedan
förälder
incheckning
2cd1e86814

+ 25
- 0
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Visa fil

@@ -134,6 +134,31 @@ public class TaBuildingDynamicController extends BaseController {
134 134
         return responseBean;
135 135
     }
136 136
 
137
+    @ApiOperation(value = "后台管理端查询项目活动列表", notes = "后台管理端查询项目活动列表")
138
+    @ApiImplicitParams({
139
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
140
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
141
+            @ApiImplicitParam(dataTypeClass = String.class, name = "name", paramType = "query",value = "项目名称"),
142
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市id"),
143
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
144
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题"),
145
+            @ApiImplicitParam(dataTypeClass = String.class, name = "isEnlist", paramType = "query",value = "是否报名"),
146
+            @ApiImplicitParam(dataTypeClass = String.class, name = "time", paramType = "query",value = "日期")
147
+    })
148
+    @RequestMapping(value = "/admin/iBuildingDynamicSelected", method = RequestMethod.GET)
149
+    public ResponseBean iBuildingDynamicSelectedList(@RequestParam("pageNum")Integer pageNum,
150
+                                             @RequestParam("pageSize")Integer pageSize,
151
+                                             @RequestParam(required = false)String name,
152
+                                             @RequestParam(required = false)Integer cityId,
153
+                                             @RequestParam(required = false)String buildingId,
154
+                                             @RequestParam(required = false)String title,
155
+                                             @RequestParam(required = false)String isEnlist,
156
+                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,
157
+                                             @RequestParam(required = false)String activityStatus,HttpServletRequest request){
158
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectedList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus);
159
+        return responseBean;
160
+    }
161
+
137 162
     @RequestMapping(value = "/admin/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
138 163
     public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") String id, HttpSession session){
139 164
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);

+ 2
- 0
src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java Visa fil

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

+ 16
- 0
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java Visa fil

@@ -123,4 +123,20 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
123 123
      * @return
124 124
      */
125 125
     List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(int i, Integer pageSize, String dynamicId, String isCheckin, String name, String phone,Integer orgId);
126
+
127
+    /**
128
+     * 下拉选框数据
129
+     * @param pageNum
130
+     * @param pageSize
131
+     * @param name
132
+     * @param buildingId
133
+     * @param cityId
134
+     * @param isEnlist
135
+     * @param time
136
+     * @param title
137
+     * @param orgId
138
+     * @param activityStatus
139
+     * @return
140
+     */
141
+    ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus);
126 142
 }

+ 31
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Visa fil

@@ -367,6 +367,37 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
367 367
         return taActivityDynamicEnlistMapper.getTaActivityDynamicEnlistExport(i,pageSize,dynamicId,isCheckin,name,phone,orgId);
368 368
     }
369 369
 
370
+    /**
371
+     * 下拉选框数据
372
+     *
373
+     * @param pageNum
374
+     * @param pageSize
375
+     * @param name
376
+     * @param buildingId
377
+     * @param cityId
378
+     * @param isEnlist
379
+     * @param time
380
+     * @param title
381
+     * @param orgId
382
+     * @param activityStatus
383
+     * @return
384
+     */
385
+    @Override
386
+    public ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus) {
387
+        Page<TaBuildingDynamic> page = new Page<>();
388
+        page.setSize(pageSize == null ? 10 : pageSize);
389
+        page.setCurrent(pageNum == null ? 1 : pageNum);
390
+
391
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.iBuildingDynamicSelectedList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus);
392
+
393
+        HashMap hashMap= new HashMap<>();
394
+        hashMap.put("list",buildingDynamic.getRecords());
395
+        hashMap.put("total",buildingDynamic.getTotal());
396
+        hashMap.put("pageNum",buildingDynamic.getCurrent());
397
+        hashMap.put("pageSize",buildingDynamic.getSize());
398
+        return ResponseBean.success(hashMap);
399
+    }
400
+
370 401
     @Override
371 402
     public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
372 403
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();

+ 32
- 0
src/main/resources/mapper/TaBuildingDynamicMapper.xml Visa fil

@@ -48,6 +48,38 @@
48 48
         ORDER BY tbd.heavy DESC
49 49
   </select>
50 50
 
51
+    <select id="iBuildingDynamicSelectedList" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">
52
+        select
53
+        *,
54
+        (select sum(tade.attend_num) from ta_activity_dynamic_enlist tade where tade.dynamic_id = tbd.dynamic_id ) as count
55
+        from ta_building_dynamic tbd where tbd.status = 1
56
+        <if test="name != null and name !=''">
57
+            and tbd.title like CONCAT('%', #{name} , '%')
58
+        </if>
59
+        <if test="activityStatus != null and activityStatus !=''">
60
+            and tbd.activity_status != #{activityStatus}
61
+        </if>
62
+        <if test="buildingId != null and buildingId !=''">
63
+            and tbd.building_id = #{buildingId}
64
+        </if>
65
+        <if test="isEnlist != null and isEnlist !=''">
66
+            and tbd.is_enlist = #{isEnlist}
67
+        </if>
68
+        <if test="cityId != 0 and cityId != null">
69
+            and tbd.city_id = #{cityId}
70
+        </if>
71
+        <if test="title != null and title != ''">
72
+            and tbd.title like CONCAT('%', #{title} , '%')
73
+        </if>
74
+        <if test="orgId != null and orgId != ''">
75
+            and tbd.org_id = #{orgId}
76
+        </if>
77
+        <if test="time != null">
78
+            and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
79
+        </if>
80
+        ORDER BY tbd.heavy DESC
81
+    </select>
82
+
51 83
     <select id="iBuildingDynamicSelectId" parameterType="string" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">
52 84
       SELECT
53 85
             dynamic_id,