diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java index ba4c1357..94dc6107 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java @@ -36,4 +36,22 @@ public class MeetingCommon { * 已提醒 */ public static final Integer REMIND_1 = 1; + /** + * 会议状态 全部 + */ + public final static String MEETING_STATUS_1 = "1"; + /** + * 会议状态 未开始 + */ + public final static String MEETING_STATUS_2 = "2"; + /** + * 会议状态 进行中 + */ + public final static String MEETING_STATUS_3 = "3"; + /** + * 会议状态 已结束 + */ + public final static String MEETING_STATUS_4 = "4"; + + } 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 96b6bc6e..8d038d7b 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.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; @@ -77,6 +78,7 @@ public class PayMeetingController extends JeroController a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime) ); - }else if (ObjectUtil.isNotEmpty(meetingStartTime)){ + } else if (ObjectUtil.isNotEmpty(meetingStartTime)) { queryWrapper.not( a -> a.lt("end_time", meetingStartTime) ); - }else if (ObjectUtil.isNotEmpty(meetingEndTime)){ + } else if (ObjectUtil.isNotEmpty(meetingEndTime)) { queryWrapper.not( a -> a.gt("start_time", meetingEndTime) ); @@ -125,6 +127,60 @@ public class PayMeetingController extends JeroController queryPageListContract(PayMeeting payMeeting, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); + String meetingStartTime = req.getParameter("meetingStartTime"); + String meetingEndTime = req.getParameter("meetingEndTime"); + if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) { + queryWrapper.not( + a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime) + ); + } else if (ObjectUtil.isNotEmpty(meetingStartTime)) { + queryWrapper.not( + a -> a.lt("end_time", meetingStartTime) + ); + } else if (ObjectUtil.isNotEmpty(meetingEndTime)) { + queryWrapper.not( + a -> a.gt("start_time", meetingEndTime) + ); + } + String meetingStatus = req.getParameter("meetingStatus"); + String now = DateUtil.formatDate(new Date()); + switch (meetingStatus) { + case MeetingCommon.MEETING_STATUS_2: + queryWrapper.gt("start_time", now); + break; + case MeetingCommon.MEETING_STATUS_3: + queryWrapper.ge("end_time", now); + queryWrapper.le("start_time", now); + break; + case MeetingCommon.MEETING_STATUS_4: + queryWrapper.le("end_time", now); + break; + } + + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payMeetingService.pageListContract(page, queryWrapper); + for (PayMeeting meeting : pageList.getRecords()) { + //查询会议负责人 + LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId()); + meeting.setDirectorName(user.getUsername()); + meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); + PayMeetingVO payMeetingVO = new PayMeetingVO(); + BeanUtils.copyProperties(payMeetingVO, payMeeting); + } + + return Result.OK(pageList); + } + /** * 列表查询 */ @@ -241,7 +297,7 @@ public class PayMeetingController extends JeroController selectionList = Arrays.asList(selections.split(",")); pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } - if (pageList.isEmpty()){ + if (pageList.isEmpty()) { throw new JeroBootException("没有数据"); } String meetingType = pageList.get(0).getMeetingType().toString(); @@ -309,39 +365,39 @@ public class PayMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { String fileIds = uploadFileVO.getFileIds(); String id = uploadFileVO.getId(); LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(PayMeeting::getId,id); - wrapper.set(PayMeeting::getMeetingData,fileIds); + wrapper.eq(PayMeeting::getId, id); + wrapper.set(PayMeeting::getMeetingData, fileIds); payMeetingService.update(wrapper); PayMeeting payMeeting = payMeetingService.getById(id); - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))){ + if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { List idList = Arrays.asList(fileIds.split(",")); List ossFiles = iossFileService.listByIds(idList); for (OSSFile ossFile : ossFiles) { @@ -350,21 +406,21 @@ public class PayMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { payMeetingService.publishReminder(publishReminderVO); @@ -386,7 +442,7 @@ public class PayMeetingController extends JeroController addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) { String publicKey = request.getParameter("publicKey"); String token = request.getParameter("token"); - authenticationUtils.check(token,publicKey); + authenticationUtils.check(token, publicKey); payMeetingService.addStandards(payMeeting); return Result.OK("合并开票成功!"); @@ -400,7 +456,7 @@ public class PayMeetingController extends JeroController addStandardsFile(@RequestBody List ossFileList, HttpServletRequest request) { String publicKey = request.getParameter("publicKey"); String token = request.getParameter("token"); - authenticationUtils.check(token,publicKey); + authenticationUtils.check(token, publicKey); for (OSSFile ossFile : ossFileList) { iossFileService.saveOrUpdate(ossFile); } 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 5d22880c..2dbd46ba 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 @@ -249,4 +249,11 @@ public class PayMeeting implements Serializable { /**通知正文*/ @ApiModelProperty(value = "通知正文") private String notice; + + /** + * 缴费方式 + */ + @TableField(exist = false) + @Dict(dicCode = "meeting_pay_type") + private Integer payMode; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index d4d542e1..591cf25a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -408,4 +408,11 @@ public class PayMeetingSituation implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "收入合同编号") private String contractNum; + + /** + * 会议名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "会议名称") + private String meetingName; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java index f128894f..64a752f6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java @@ -2,6 +2,10 @@ package com.jero.meeting.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import com.jero.meeting.entity.PayMeeting; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -9,9 +13,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 会议管理 * @Author: jero-boot - * @Date: 2021-09-02 + * @Date: 2021-09-02 * @Version: V1.0 */ public interface PayMeetingMapper extends BaseMapper { + IPage pageListContract(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml index bcb7e413..d0365e09 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml @@ -30,5 +30,13 @@ + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index a07ac5d8..58efe70d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -1,5 +1,8 @@ package com.jero.meeting.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.meeting.entity.PayMeeting; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.meeting.entity.PayMeetingSituation; @@ -62,4 +65,5 @@ public interface IPayMeetingService extends IService { void publishReminder(PublishReminderVO publishReminderVO); + IPage pageListContract(Page page, QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 6c582470..eebb8923 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -3,6 +3,8 @@ package com.jero.meeting.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.enums.ManagementMessageEnums; @@ -450,4 +452,9 @@ public class PayMeetingServiceImpl extends ServiceImpl pageListContract(Page page, QueryWrapper queryWrapper) { + return baseMapper.pageListContract(page,queryWrapper); + } }