wangfei 6 years ago
parent
commit
bb67d7d66d

+ 1
- 1
whole-estate/src/main/java/com/example/wholeestate/controller/ActivityController.java View File

221
     public ResponseBean getWxList(@RequestParam(defaultValue = "1") Integer pageNum,
221
     public ResponseBean getWxList(@RequestParam(defaultValue = "1") Integer pageNum,
222
                                 @RequestParam(defaultValue = "10") Integer pageSize) {
222
                                 @RequestParam(defaultValue = "10") Integer pageSize) {
223
         ResponseBean responseBean = new ResponseBean();
223
         ResponseBean responseBean = new ResponseBean();
224
-        responseBean = iActivityService.getList(pageNum, pageSize, null,null,null);
224
+        responseBean = iActivityService.getWxList(pageNum, pageSize);
225
         return responseBean;
225
         return responseBean;
226
     }
226
     }
227
 
227
 

+ 8
- 0
whole-estate/src/main/java/com/example/wholeestate/service/IActivityService.java View File

24
      */
24
      */
25
     ResponseBean getList(Integer pageNum, Integer pageSize, String name, Date beginDate, Date endDate);
25
     ResponseBean getList(Integer pageNum, Integer pageSize, String name, Date beginDate, Date endDate);
26
 
26
 
27
+    /**
28
+     * 查询活动列表
29
+     * @param pageNum
30
+     * @param pageSize
31
+     * @return
32
+     */
33
+    ResponseBean getWxList(Integer pageNum, Integer pageSize);
34
+
27
     /**
35
     /**
28
      * 根据 活动id 查询
36
      * 根据 活动id 查询
29
      * @param activityId
37
      * @param activityId

+ 20
- 0
whole-estate/src/main/java/com/example/wholeestate/service/impl/ActivityServiceImpl.java View File

57
         return responseBean;
57
         return responseBean;
58
     }
58
     }
59
 
59
 
60
+    @Override
61
+    public  ResponseBean getWxList(Integer pageNum, Integer pageSize) {
62
+        ResponseBean responseBean = new ResponseBean();
63
+
64
+        Page<Activity> page = new Page<>();
65
+        page.setCurrent(pageNum == null ? 1 : pageNum);
66
+        page.setSize(pageSize == null ? 10 : pageSize);
67
+        QueryWrapper<Activity> queryWrapper = new QueryWrapper<>();
68
+        queryWrapper.eq("status", 1);
69
+        IPage<Activity> activityIPage = activityMapper.selectPage(page, queryWrapper);
70
+        List<Activity> records = activityIPage.getRecords();
71
+        records.forEach(e -> {
72
+            Integer signUpNumber = activityMapper.signUpNumber(e.getActivityId());
73
+            e.setSignUpNumber(null == signUpNumber ? 0 : signUpNumber);
74
+        });
75
+
76
+        responseBean.addSuccess(activityIPage);
77
+        return responseBean;
78
+    }
79
+
60
     @Override
80
     @Override
61
     public ResponseBean getActivityId(String activityId) {
81
     public ResponseBean getActivityId(String activityId) {
62
         ResponseBean responseBean = new ResponseBean();
82
         ResponseBean responseBean = new ResponseBean();