From a3dd5a6253dacaae9df03e2fdd9aae05734d2079 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 5 Jan 2022 15:32:45 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E6=9F=A5=E8=AF=A2=E5=8F=82=E4=BC=9A=E4=BA=BA=E7=9A=84?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommitteeMeetingSituationController.java | 2 +- .../CouncilMeetingSituationController.java | 2 +- .../InternalMeetingSituationController.java | 7 +++++-- .../OtherMeetingSituationController.java | 14 +++++--------- .../StandardsMeetingSituationController.java | 14 +++++--------- .../WorkGroupMeetingSituationController.java | 14 +++++--------- .../com/jero/meeting/mapper/PayMeetingMapper.java | 1 + .../jero/meeting/mapper/xml/PayMeetingMapper.xml | 7 +++++++ .../service/IPayMeetingSituationService.java | 2 +- .../service/impl/PayMeetingServiceImpl.java | 8 ++++++-- .../impl/PayMeetingSituationServiceImpl.java | 12 +++++++++--- 11 files changed, 46 insertions(+), 37 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java index 0f401bf5..565b7d7d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java @@ -92,7 +92,7 @@ public class CommitteeMeetingSituationController extends JeroController page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingSituationService.pageListContract(page, queryWrapper,MEETING_TYPE); + IPage pageList = payMeetingSituationService.pageListContract(meetingId, page, queryWrapper,MEETING_TYPE); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java index 1a46c3d3..c44a32d4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java @@ -70,7 +70,7 @@ public class CouncilMeetingSituationController extends JeroController page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingSituationService.pageListContract(page, queryWrapper,MEETING_TYPE); + IPage pageList = payMeetingSituationService.pageListContract(meetingId, page, queryWrapper,MEETING_TYPE); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); 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 7f722a0f..488a7372 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 @@ -16,7 +16,6 @@ import com.jero.common.util.ValidUtil; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.meeting.common.MeetingCommon; -import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.*; @@ -70,13 +69,17 @@ public class InternalMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); String particularYear = request.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); + IPage pageList = payMeetingSituationService.pageListContract(meetingId, page, queryWrapper,MEETING_TYPE); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java index 2aa4814b..bd398fa0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java @@ -11,35 +11,27 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.AuthenticationUtils; -import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.common.util.oConvertUtils; -import com.jero.company.entity.PayCompanyManagement; -import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.*; -import com.jero.meeting.vo.excel.*; import com.jero.project.common.PayProjectCommon; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; /** @@ -74,13 +66,17 @@ public class OtherMeetingSituationController extends JeroController 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); + IPage pageList = payMeetingSituationService.pageListContract(meetingId, page, queryWrapper,MEETING_TYPE); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java index 45900196..cdfb15b8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java @@ -11,35 +11,27 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.AuthenticationUtils; -import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.common.util.oConvertUtils; -import com.jero.company.entity.PayCompanyManagement; -import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.*; -import com.jero.meeting.vo.excel.*; import com.jero.project.common.PayProjectCommon; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; /** @@ -74,13 +66,17 @@ public class StandardsMeetingSituationController extends JeroController 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); + IPage pageList = payMeetingSituationService.pageListContract(meetingId, page, queryWrapper,MEETING_TYPE); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index 93f27304..1ceb4e37 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -11,35 +11,27 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.AuthenticationUtils; -import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.common.util.oConvertUtils; -import com.jero.company.entity.PayCompanyManagement; -import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.*; -import com.jero.meeting.vo.excel.*; import com.jero.project.common.PayProjectCommon; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; /** @@ -74,13 +66,17 @@ public class WorkGroupMeetingSituationController extends JeroController 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); + IPage pageList = payMeetingSituationService.pageListContract(meetingId, page, queryWrapper,MEETING_TYPE); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); 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 d172e9b9..80ef82e2 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 @@ -37,6 +37,7 @@ public interface PayMeetingMapper extends BaseMapper { IPage standardPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage basePage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); PayMeeting queryByIdAndTime(@Param("id") String id, @Param("now") Date now); } 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 8f048777..216fe28b 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 @@ -226,6 +226,13 @@ ${ew.customSqlSegment} + +