diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index 354e2e8c..0670432a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -92,6 +92,7 @@ public class CommitteeMeetingController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); String meetingStartTime = req.getParameter("meetingStartTime"); String meetingEndTime = req.getParameter("meetingEndTime"); @@ -130,91 +131,6 @@ public class CommitteeMeetingController 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()); - if (StringUtils.isNotBlank(meetingStatus)) { - switch (meetingStatus) { - case MeetingCommon.MEETING_STATUS_2: - queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now); - break; - case MeetingCommon.MEETING_STATUS_3: - queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now); - queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now); - break; - case MeetingCommon.MEETING_STATUS_4: - queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now); - break; - } - } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String id = sysUser.getId(); - - //会议报名状态:1可报名/2已报名 - String meetingSignUpType = req.getParameter("meetingSignUpType"); - if (Objects.equals(meetingSignUpType,1+"")) { - queryWrapper.eq("pmrr.contact_id",id); - }else if (Objects.equals(meetingSignUpType,2+"")) { - queryWrapper.eq("pms.company_contact_id",id); - }else { - queryWrapper.and( - a -> a.eq("pms.company_contact_id",id) - .or() - .eq("pms.post_contact_id",id) - .or() - .eq("pmrr.contact_id",id) - ); - } - - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingService.pageListContract(page, queryWrapper, now); - 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); - } - - /** - * 列表查询 - */ - @RequiresPermissions("committeeMeeting:search") - @ApiOperation(value = "会议管理-列表查询", notes = "会议管理-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { - List list = payMeetingService.queryList(); - return Result.OK(list); - } - /** * 添加 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index be80c272..18c463af 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -92,6 +92,7 @@ public class InternalMeetingController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); String meetingStartTime = req.getParameter("meetingStartTime"); String meetingEndTime = req.getParameter("meetingEndTime"); @@ -130,79 +131,6 @@ public class InternalMeetingController 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()); - if (StringUtils.isNotBlank(meetingStatus)) { - switch (meetingStatus) { - case MeetingCommon.MEETING_STATUS_2: - queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now); - break; - case MeetingCommon.MEETING_STATUS_3: - queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now); - queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now); - break; - case MeetingCommon.MEETING_STATUS_4: - queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now); - break; - } - } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String id = sysUser.getId(); - - //会议报名状态:1可报名/2已报名 - String meetingSignUpType = req.getParameter("meetingSignUpType"); - if (Objects.equals(meetingSignUpType,1+"")) { - queryWrapper.eq("pmrr.contact_id",id); - }else if (Objects.equals(meetingSignUpType,2+"")) { - queryWrapper.eq("pms.company_contact_id",id); - }else { - queryWrapper.and( - a -> a.eq("pms.company_contact_id",id) - .or() - .eq("pms.post_contact_id",id) - .or() - .eq("pmrr.contact_id",id) - ); - } - - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingService.pageListContract(page, queryWrapper, now); - 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); - } /** * 列表查询 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index fdcc9b4e..36d13216 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -92,6 +92,7 @@ public class OtherMeetingController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); String meetingStartTime = req.getParameter("meetingStartTime"); String meetingEndTime = req.getParameter("meetingEndTime"); @@ -130,80 +131,6 @@ public class OtherMeetingController 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()); - if (StringUtils.isNotBlank(meetingStatus)) { - switch (meetingStatus) { - case MeetingCommon.MEETING_STATUS_2: - queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now); - break; - case MeetingCommon.MEETING_STATUS_3: - queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now); - queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now); - break; - case MeetingCommon.MEETING_STATUS_4: - queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now); - break; - } - } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String id = sysUser.getId(); - - //会议报名状态:1可报名/2已报名 - String meetingSignUpType = req.getParameter("meetingSignUpType"); - if (Objects.equals(meetingSignUpType,1+"")) { - queryWrapper.eq("pmrr.contact_id",id); - }else if (Objects.equals(meetingSignUpType,2+"")) { - queryWrapper.eq("pms.company_contact_id",id); - }else { - queryWrapper.and( - a -> a.eq("pms.company_contact_id",id) - .or() - .eq("pms.post_contact_id",id) - .or() - .eq("pmrr.contact_id",id) - ); - } - - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingService.pageListContract(page, queryWrapper, now); - 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); - } - /** * 列表查询 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index 026e9b91..e62a320c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -92,6 +92,7 @@ public class StandardsMeetingController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); String meetingStartTime = req.getParameter("meetingStartTime"); String meetingEndTime = req.getParameter("meetingEndTime"); @@ -130,80 +131,6 @@ public class StandardsMeetingController 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()); - if (StringUtils.isNotBlank(meetingStatus)) { - switch (meetingStatus) { - case MeetingCommon.MEETING_STATUS_2: - queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now); - break; - case MeetingCommon.MEETING_STATUS_3: - queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now); - queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now); - break; - case MeetingCommon.MEETING_STATUS_4: - queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now); - break; - } - } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String id = sysUser.getId(); - - //会议报名状态:1可报名/2已报名 - String meetingSignUpType = req.getParameter("meetingSignUpType"); - if (Objects.equals(meetingSignUpType,1+"")) { - queryWrapper.eq("pmrr.contact_id",id); - }else if (Objects.equals(meetingSignUpType,2+"")) { - queryWrapper.eq("pms.company_contact_id",id); - }else { - queryWrapper.and( - a -> a.eq("pms.company_contact_id",id) - .or() - .eq("pms.post_contact_id",id) - .or() - .eq("pmrr.contact_id",id) - ); - } - - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingService.pageListContract(page, queryWrapper, now); - 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); - } - /** * 列表查询 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index 4bf49d14..c6ef98f5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -92,6 +92,7 @@ public class WorkGroupMeetingController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); String meetingStartTime = req.getParameter("meetingStartTime"); String meetingEndTime = req.getParameter("meetingEndTime"); @@ -130,80 +131,6 @@ public class WorkGroupMeetingController 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()); - if (StringUtils.isNotBlank(meetingStatus)) { - switch (meetingStatus) { - case MeetingCommon.MEETING_STATUS_2: - queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now); - break; - case MeetingCommon.MEETING_STATUS_3: - queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now); - queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now); - break; - case MeetingCommon.MEETING_STATUS_4: - queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now); - break; - } - } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String id = sysUser.getId(); - - //会议报名状态:1可报名/2已报名 - String meetingSignUpType = req.getParameter("meetingSignUpType"); - if (Objects.equals(meetingSignUpType,1+"")) { - queryWrapper.eq("pmrr.contact_id",id); - }else if (Objects.equals(meetingSignUpType,2+"")) { - queryWrapper.eq("pms.company_contact_id",id); - }else { - queryWrapper.and( - a -> a.eq("pms.company_contact_id",id) - .or() - .eq("pms.post_contact_id",id) - .or() - .eq("pmrr.contact_id",id) - ); - } - - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingService.pageListContract(page, queryWrapper, now); - 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); - } - /** * 列表查询 */ 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 18adca2a..1a14c7ef 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 @@ -97,6 +97,10 @@ public class PayMeeting implements Serializable { @ApiModelProperty(value = "分标委名称") private String caseCommitteeName; + /**标协项目id*/ + @ApiModelProperty(value = "标协项目id") + private String standardsId; + /**开始时间*/ @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")