From 59437c80135837273a4548e48cc09ded6ef4ceb0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 21 Oct 2021 14:35:04 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2040930=20=E5=85=B3=E8=81=94=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE-=E9=80=89=E6=8B=A9=E4=BC=9A=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE--=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=8E?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayMeetingSituationServiceImpl.java | 5 ++++- .../controller/PayMemberProjectController.java | 16 +++++++++------- .../member/mapper/PayMemberProjectMapper.java | 9 ++------- .../member/mapper/xml/PayMemberProjectMapper.xml | 4 ++-- .../member/service/IPayMemberProjectService.java | 7 +------ .../impl/PayPayMemberProjectServiceImpl.java | 12 ++---------- 6 files changed, 20 insertions(+), 33 deletions(-) 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 dfdc8e52..da7e5e25 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 @@ -166,7 +166,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl queryListByCompany( - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - @RequestParam(name = "companyId") String companyId, - @RequestParam(name = "contractId") String contractId, - @RequestParam(name = "projectType") String projectType, - @RequestParam(name = "memberName",required = false) String memberName) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "companyId") String companyId, + @RequestParam(name = "contractId") String contractId, + @RequestParam(name = "projectType") String projectType, + @RequestParam(name = "projectName",required = false) String projectName, + @RequestParam(name = "memberName", required = false) String memberName) { if(StringUtils.isBlank(companyId)){ return Result.error("企业id不能为空！"); @@ -124,7 +125,8 @@ public class PayMemberProjectController extends JeroController page = new Page<>(pageNo, pageSize); - IPage list = memberProjectService.queryListByCompany(page,companyId,memberName,PayProjectCommon.PROJECT_TYPE4,payIncomeContract.getPack(),payIncomeContract.getPackYear()); + projectName = oConvertUtils.replaceAllPercent(projectName); + IPage list = memberProjectService.queryListByCompany(page,companyId,projectName,PayProjectCommon.PROJECT_TYPE4,payIncomeContract.getPack(),payIncomeContract.getPackYear()); return Result.OK(list); } // 标协会员 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectMapper.java index a57dcd28..1e87ed9d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectMapper.java @@ -4,13 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.member.entity.PayMemberProject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.project.entity.PayWorkGroupSubletStatistics; -import com.jero.statistics.entity.AllProjectStatistics; -import com.jero.statistics.entity.AllProjectStatisticsSearch; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * @Description: 会员项目表 * @Author: jero-boot @@ -23,10 +18,10 @@ public interface PayMemberProjectMapper extends BaseMapper { * @Author lqt * @Date 2021/9/17 * @Param companyId 企业id - * @Param memberName 会员名称 + * @Param projectName 会员名称 * @Param projectType 项目类型 * @Return * @Exception */ - IPage queryListByCompany(Page page,@Param("companyId") String companyId,@Param("memberName") String memberName,@Param("projectType") String projectType,@Param("pack") Integer pack,@Param("packYear") String packYear); + IPage queryListByCompany(Page page, @Param("companyId") String companyId, @Param("projectName") String projectName, @Param("projectType") String projectType, @Param("pack") Integer pack, @Param("packYear") String packYear); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectMapper.xml index 5c6d4b5b..82471353 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectMapper.xml @@ -25,8 +25,8 @@ LEFT JOIN pay_income_contract_associated pica ON pica.project_id = pmps.id WHERE pmps.company_id =#{companyId} AND pmp.id IS NOT NULL AND pmp.id != '' AND (pica.id is null OR pica.id = '') - - AND pmp.project_name like concat('%',concat(#{memberName},'%')) + + AND pmp.project_name like concat('%',#{projectName},'%') AND (ppc.pack_year=#{packYear} or ppc.id is null OR ppc.id ='') diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java index 6882a3cb..ccdd2b24 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java @@ -5,11 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.member.entity.PayMemberProject; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.project.entity.PayWorkGroupSubletStatistics; -import com.jero.statistics.entity.AllProjectStatistics; -import com.jero.statistics.entity.AllProjectStatisticsSearch; - -import com.jero.project.common.PayProjectCommon; import java.util.List; @@ -87,5 +82,5 @@ public interface IPayMemberProjectService extends IService { * @Return * @Exception */ - IPage queryListByCompany(Page page,String companyId,String memberName,String projectType,Integer pack,String packYear); + IPage queryListByCompany(Page page, String companyId, String projectName, String projectType, Integer pack, String packYear); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java index 1f9b1ed1..1281c286 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java @@ -5,7 +5,6 @@ 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.exception.JeroBootException; -import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.contract.service.IPayIncomeContractService; import com.jero.member.entity.PayMemberProject; @@ -15,17 +14,10 @@ import com.jero.member.service.IPayMemberProjectService; import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; -import com.jero.project.entity.PayWorkGroupSubletStatistics; -import com.jero.statistics.entity.AllProjectStatistics; -import com.jero.statistics.entity.AllProjectStatisticsSearch; -import com.jero.project.common.PayProjectCommon; -import com.jero.project.entity.PayWorkingGroupSubItem; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; @@ -158,7 +150,7 @@ public class PayPayMemberProjectServiceImpl extends ServiceImpl queryListByCompany(Page page,String companyId, String memberName, String projectType,Integer pack,String packYear) { - return payMemberProjectMapper.queryListByCompany(page,companyId,memberName,projectType, pack, packYear); + public IPage queryListByCompany(Page page, String companyId, String projectName, String projectType, Integer pack, String packYear) { + return payMemberProjectMapper.queryListByCompany(page,companyId, projectName,projectType, pack, packYear); } }