From 2a0c6c108462a16bd506f8c97daff73ef8ddbb14 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 7 Jan 2022 14:04:50 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=AB=AF-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=BD=93=E5=89=8D=E4=BA=BA=E6=98=AF=E5=90=A6=E6=98=AF?= =?UTF-8?q?=E5=88=86=E6=A0=87=E5=A7=94=E6=88=96=E7=90=86=E4=BA=8B=E4=BC=9A?= =?UTF-8?q?=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InternalMeetingSituationController.java | 2 +- .../PayMeetingSituationController.java | 55 ++++--------------- .../service/IPayMeetingSituationService.java | 4 +- .../impl/PayMeetingSituationServiceImpl.java | 30 +++++++++- 4 files changed, 43 insertions(+), 48 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java index 488a7372..469e2918 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java @@ -235,6 +235,6 @@ public class InternalMeetingSituationController extends JeroController checkMember(String companyName) { - return Result.OK(payMeetingSituationService.checkMember(companyName)); + return Result.OK(payMeetingSituationService.checkMemberCompany(companyName)); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index aeccf4a1..e4665c09 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -30,7 +30,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.meeting.valid.group.SignIn; import com.jero.meeting.vo.*; import com.jero.meeting.vo.excel.*; -import com.jero.project.common.PayProjectCommon; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.apache.commons.lang3.StringUtils; @@ -64,36 +63,6 @@ public class PayMeetingSituationController extends JeroController queryPageList(PayMeetingSituation payMeetingSituation, - // @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - // @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - // HttpServletRequest req) { - // QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); - // String particularYear = req.getParameter("particularYear"); - // if (StringUtils.isNotBlank(particularYear)){ - // queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear); - // } - // Page page = new Page<>(pageNo, pageSize); - // IPage pageList = payMeetingSituationService.pageListContract(page, queryWrapper,MEETING_TYPE); - // List situationList = pageList.getRecords(); - // for (PayMeetingSituation meetingSituation : situationList) { - // Integer payMode = meetingSituation.getPayMode(); - // //汇款并且缴费凭证为空 - // if (Objects.equals(payMode,1) && StringUtils.isBlank(meetingSituation.getPaymentRecord())){ - // meetingSituation.setIdentification(PayProjectCommon.YES); - // }else { - // meetingSituation.setIdentification(PayProjectCommon.NO); - // } - // } - // return Result.OK(pageList); - //} /** * 合同查询未关联参会人列表 @@ -152,19 +121,6 @@ public class PayMeetingSituationController extends JeroController edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) { - // payMeetingSituationService.editById(payMeetingSituationVO, MEETING_TYPE); - // return Result.OK("编辑成功!"); - //} - /** * 企业端上传缴费凭证 编辑 */ @@ -381,4 +337,15 @@ public class PayMeetingSituationController extends JeroController checkMember(@RequestParam(name = "meetingId") String meetingId, + @RequestParam(name = "meetingType") Integer meetingType) { + Boolean aBoolean = payMeetingSituationService.checkMember(meetingId, meetingType); + return Result.OK(aBoolean); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java index 79cfeacc..2ac6223b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java @@ -30,7 +30,7 @@ public interface IPayMeetingSituationService extends IService getaClass(Integer meetingType); Integer standardsCheckPhone(String meetingId, String phone); + + Boolean checkMember(String meetingId, Integer meetingType); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 4d9d785a..bdce409b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1093,7 +1093,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl 0; } @@ -1570,4 +1570,30 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId()); + wrapper.eq(PayCaseCommitteeSubitem::getContactsId, userId); + + int count = payCaseCommitteeSubitemService.count(wrapper); + if (count > 0) { + return true; + } + } else if (meetingType.equals(MeetingCommon.COUNCIL_MEETING_INT)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayCaseCouncilSubitem::getCouncilId, payMeeting.getCouncilId()); + wrapper.eq(PayCaseCouncilSubitem::getContactsId, userId); + int count = payCaseCouncilSubitemService.count(wrapper); + if (count > 0) { + return true; + } + } + return null; + } }