diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 1e41e6c6..ba7afc5c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/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 queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); - String meetingStartTime = req.getParameter("meetingStartTime"); - String meetingEndTime = req.getParameter("meetingEndTime"); + String meetingStartTime; + 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) @@ -177,20 +186,21 @@ public class PayMeetingController extends JeroController a.eq("pms.company_contact_id",id) + a -> a.eq("pms.company_contact_id", id) .or() - .eq("pms.post_contact_id",id) + .eq("pms.post_contact_id", id) .or() - .eq("pmrr.contact_id",id) + .eq("pmrr.contact_id", id) ); } + Page page = new Page<>(pageNo, pageSize); IPage pageList = payMeetingService.pageListContract(page, queryWrapper, now); for (PayMeeting meeting : pageList.getRecords()) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index 1a14c7ef..7e2ac5b2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/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; }