add 小程序查询我的会议增加参数月份

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java

@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -141,8 +142,16 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                            HttpServletRequest req) {
         QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
-        String meetingStartTime = req.getParameter("meetingStartTime");
+        String meetingStartTime;
-        String meetingEndTime = req.getParameter("meetingEndTime");
+        String meetingEndTime;
+        Date month = payMeeting.getMonth();
+        if (Objects.nonNull(month)) {
+            meetingStartTime = DateUtil.formatDate(DateUtil.beginOfMonth(month));
+            meetingEndTime = DateUtil.formatDate(DateUtil.endOfMonth(month));
+        } else {
+            meetingStartTime = req.getParameter("meetingStartTime");
+            meetingEndTime = req.getParameter("meetingEndTime");
+        }
         if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
             queryWrapper.not(
                     a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
@@ -191,6 +200,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
             );
         }
 
+
         Page<PayMeeting> page = new Page<>(pageNo, pageSize);
         IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now);
         for (PayMeeting meeting : pageList.getRecords()) {

jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java

@@ -3,6 +3,7 @@ package com.jero.meeting.entity;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -271,4 +272,12 @@ public class PayMeeting implements Serializable {
      */
     @TableField(exist = false)
     private String situationId;
+
+    /**
+     * 会议成员id
+     */
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM")
+    @DateTimeFormat(pattern="yyyy-MM")
+    private Date month;
 }