diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index 3efcc9cb..21b47cc9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -167,13 +167,24 @@ public class PayCaseCommitteeSubitemController extends JeroController queryPageList(@RequestParam(name="id",required = true) String id, @RequestParam(name="companyName",required = false) String companyName, - @RequestParam(name="meetingId",required = false) String meetingId) { + @RequestParam(name="meetingId",required = false) String meetingId, + @RequestParam(name="remind",required = false) String remind) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("pm.committee_id", id); if (StringUtils.isNotBlank(companyName)){ queryWrapper.like("pm.company_name",companyName); } - List list = payCaseCommitteeSubitemService.listTwo(queryWrapper); + if (StringUtils.isNotBlank(meetingId)) { + + if (Objects.equals("0",remind)) { + queryWrapper.isNull("pmrr.id"); + } + if (Objects.equals("1",remind)) { + queryWrapper.isNotNull("pmrr.id"); + } + } + + List list = payCaseCommitteeSubitemService.listTwo(queryWrapper,meetingId); if (!CollectionUtils.isEmpty(list)) { try { list.forEach(p -> { @@ -183,16 +194,16 @@ public class PayCaseCommitteeSubitemController extends JeroController wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId()); - int count = payMeetingRemindRecordService.count(wrapper); - if (count>0){ - p.setRemind(PayProjectCommon.YES); - }else { - p.setRemind(PayProjectCommon.NO); - } - } + //if (StringUtils.isNotBlank(meetingId)){ + // LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + // wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId()); + // int count = payMeetingRemindRecordService.count(wrapper); + // if (count>0){ + // p.setRemind(PayProjectCommon.YES); + // }else { + // p.setRemind(PayProjectCommon.NO); + // } + //} }); } catch (Exception e) { log.error("手机号、邮箱解密异常!", e); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java index 1190d8ca..c569a826 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java @@ -226,29 +226,39 @@ public class PayCaseCouncilSubitemController extends JeroController queryPageList(@RequestParam(name="id",required = true) String id, @RequestParam(name="companyName",required = false) String companyName, - @RequestParam(name="meetingId",required = false) String meetingId) { + @RequestParam(name="meetingId",required = false) String meetingId, + @RequestParam(name="remind",required = false) String remind) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("pm.council_id", id); if (StringUtils.isNotBlank(companyName)){ queryWrapper.like("pm.company_name",companyName); } - List list = payCaseCouncilSubitemService.listTwo(queryWrapper); + if (StringUtils.isNotBlank(meetingId)) { + + if (Objects.equals("0",remind)) { + queryWrapper.isNull("pmrr.id"); + } + if (Objects.equals("1",remind)) { + queryWrapper.isNotNull("pmrr.id"); + } + } + List list = payCaseCouncilSubitemService.listTwo(queryWrapper,meetingId); if (!CollectionUtils.isEmpty(list)) { try { list.forEach(p -> { if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) { p.setPhone(PasswordUtil.decrypt(p.getPhone())); } - if (StringUtils.isNotBlank(meetingId)){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId()); - int count = payMeetingRemindRecordService.count(wrapper); - if (count>0){ - p.setRemind(PayProjectCommon.YES); - }else { - p.setRemind(PayProjectCommon.NO); - } - } + //if (StringUtils.isNotBlank(meetingId)){ + // LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + // wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId()); + // int count = payMeetingRemindRecordService.count(wrapper); + // if (count>0){ + // p.setRemind(PayProjectCommon.YES); + // }else { + // p.setRemind(PayProjectCommon.NO); + // } + //} }); } catch (Exception e) { log.error("手机号、邮箱解密异常!", e); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java index 350f9d75..5d249242 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java @@ -2,7 +2,6 @@ package com.jero.data.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; -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; @@ -12,7 +11,6 @@ import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; import org.apache.ibatis.annotations.Param; -import javax.validation.Valid; import java.util.ArrayList; import java.util.List; @@ -26,7 +24,7 @@ public interface PayCaseCommitteeSubitemMapper extends BaseMapper listThree (Page page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param("userId") String userId); - List listTwo (@Param(Constants.WRAPPER) Wrapper wrapper); + List listTwo(@Param(Constants.WRAPPER) Wrapper wrapper,@Param("meetingId") String meetingId); List listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("councilName") String councilName); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java index 0d68bf67..c174694a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java @@ -27,6 +27,6 @@ public interface PayCaseCouncilSubitemMapper extends BaseMapper listThreeTwo(Page page, @Param("id")String id,@Param("councilNames") String councilNames); - List listTwo(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List listTwo(@Param(Constants.WRAPPER) QueryWrapper queryWrapper,@Param("meetingId") String meetingId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index 5bb3f0cd..d3db0b53 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -87,12 +87,19 @@ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java index 176308b8..936d4c4b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java @@ -24,7 +24,7 @@ public interface IPayCaseCommitteeSubitemService extends IService selectList(LambdaQueryWrapper queryWrapper); - List listTwo(QueryWrapper queryWrapper); + List listTwo(QueryWrapper queryWrapper, String meetingId); IPage listThree(Page page,String name,String companyName,String fenBiaoWeiName,String userId); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java index 5078410c..88b1e5c3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java @@ -25,6 +25,6 @@ public interface IPayCaseCouncilSubitemService extends IService listThreeTwo(Page page, String id, String councilNames); - List listTwo(QueryWrapper queryWrapper); + List listTwo(QueryWrapper queryWrapper, String meetingId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java index 1e742169..e1e215cf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java @@ -37,8 +37,8 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl listTwo(QueryWrapper queryWrapper) { - return payCaseCommitteeSubitemMapper.listTwo(queryWrapper); + public List listTwo(QueryWrapper queryWrapper, String meetingId) { + return payCaseCommitteeSubitemMapper.listTwo(queryWrapper,meetingId); } @Override diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java index 3809a93f..0fca1f9c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java @@ -46,8 +46,8 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl listTwo(QueryWrapper queryWrapper) { - return payCaseCouncilSubitemMapper.listTwo(queryWrapper); + public List listTwo(QueryWrapper queryWrapper, String meetingId) { + return payCaseCouncilSubitemMapper.listTwo(queryWrapper,meetingId); } 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 cdc3a4e8..9efe2c24 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 @@ -229,8 +229,8 @@ public class CommitteeMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13,"C_OPEN_TYPE13"); - return Result.OK(); + List strings = payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13, "C_OPEN_TYPE13"); + return Result.OK("发布成功",strings); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java index 7ed779b3..03c8e88e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java @@ -214,8 +214,8 @@ public class CouncilMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13,"C_OPEN_TYPE13"); - return Result.OK(); + List strings = payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13, "C_OPEN_TYPE13"); + return Result.OK("发布成功",strings); } }