LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lijiarao
2021-10-09 16:53:40 +08:00
parent 0f46af41ee
commit 3a94e730d9
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+20 -10
View File
@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); 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)) { if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
queryWrapper.not( queryWrapper.not(
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime) a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
@@ -177,20 +186,21 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
//会议报名状态：1可报名/2已报名 //会议报名状态：1可报名/2已报名
String meetingSignUpType = req.getParameter("meetingSignUpType"); String meetingSignUpType = req.getParameter("meetingSignUpType");
if (Objects.equals(meetingSignUpType,1+"")) { if (Objects.equals(meetingSignUpType, 1 + "")) {
queryWrapper.eq("pmrr.contact_id",id); queryWrapper.eq("pmrr.contact_id", id);
}else if (Objects.equals(meetingSignUpType,2+"")) { } else if (Objects.equals(meetingSignUpType, 2 + "")) {
queryWrapper.eq("pms.company_contact_id",id); queryWrapper.eq("pms.company_contact_id", id);
}else { } else {
queryWrapper.and( queryWrapper.and(
a -> a.eq("pms.company_contact_id",id) a -> a.eq("pms.company_contact_id", id)
.or() .or()
.eq("pms.post_contact_id",id) .eq("pms.post_contact_id", id)
.or() .or()
.eq("pmrr.contact_id",id) .eq("pmrr.contact_id", id)
); );
} }
Page<PayMeeting> page = new Page<>(pageNo, pageSize); Page<PayMeeting> page = new Page<>(pageNo, pageSize);
IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now); IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now);
for (PayMeeting meeting : pageList.getRecords()) { for (PayMeeting meeting : pageList.getRecords()) {
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+9
View File
@@ -3,6 +3,7 @@ package com.jero.meeting.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
@@ -271,4 +272,12 @@ public class PayMeeting implements Serializable {
*/ */
@TableField(exist = false) @TableField(exist = false)
private String situationId; private String situationId;
/**
* 会议成员id
*/
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM")
@DateTimeFormat(pattern="yyyy-MM")
private Date month;
} }