From 7e74f38ac4979fc6a6be952d199f4d0ef6e36b1b Mon Sep 17 00:00:00 2001 From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com> Date: Fri, 30 Aug 2024 18:40:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pusong/business/domain/bo/PsApproverRecordBo.java | 8 ++++++-- .../java/com/pusong/business/domain/vo/PsRefundVo.java | 5 +++++ .../approver/impl/ApproverAbstractServiceImpl.java | 8 ++++---- .../business/service/impl/PsContractPayServiceImpl.java | 4 +++- .../resources/mapper/business/PsContractPayMapper.xml | 3 ++- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsApproverRecordBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsApproverRecordBo.java index 145b6a3..629ed47 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsApproverRecordBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsApproverRecordBo.java @@ -82,7 +82,11 @@ public class PsApproverRecordBo { /** * 客户姓名 */ - private String customerName; + private String customName; + /** + * 客户电话 + */ + private String customMobile; /** * 公司姓名 */ @@ -90,6 +94,6 @@ public class PsApproverRecordBo { /** * 销售经理姓名 */ - private String customerManageName; + private String customManagerName; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsRefundVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsRefundVo.java index 0e6e22a..e2eed2d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsRefundVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsRefundVo.java @@ -31,6 +31,11 @@ public class PsRefundVo { * 所属客户经理 */ private String customManager; + /** + * 所属客户经理 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME,mapper = "customManager") + private String customManagerName; /** * 客户姓名 diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java index bc4d775..d957287 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java @@ -92,11 +92,11 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService { QueryWrapper lqw = Wrappers.query().eq("app.business_type",approverType()) .eq(bo.getId()!=null,"app.id",bo.getId()) .eq("app.del_flag","0") - .eq(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus()) - .eq(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName()) - .eq(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName()) + .like(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus()) + .like(StringUtils.isNotBlank(bo.getCustomName()),"cus.custom_name",bo.getCustomName()) + .like(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName()) //销售经理姓名 - .exists(StringUtils.isNotBlank(bo.getCustomerManageName()),"select 1 from sys_user su where su.user_id = cus.custom_manager and su.nick_name like %"+bo.getCustomerManageName()+"%") + .exists(StringUtils.isNotBlank(bo.getCustomManagerName()),"select 1 from sys_user su where su.user_id = cus.custom_manager and su.nick_name like %"+bo.getCustomManagerName()+"%") .orderByAsc("app.approver_status").orderByDesc("app.apply_date"); Page res = recordMapper.selectPageApproverList(pageQuery.build(), lqw); if(CollectionUtils.isNotEmpty(res.getRecords())){ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractPayServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractPayServiceImpl.java index bd83a55..d0e6d91 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractPayServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractPayServiceImpl.java @@ -174,7 +174,9 @@ public class PsContractPayServiceImpl implements IPsContractPayService { .exists(StringUtils.isNotBlank(customManageName),"select 1 from sys_user su where su.user_id = cus.custom_manager and su.nick_name like %"+customManageName+"%") .like(StringUtils.isNotBlank(companyName),"com.company_name",companyName) .like(StringUtils.isNotBlank(mobile),"cus.custom_mobile",mobile) - .eq(StringUtils.isNotBlank(name),"cus.custom_name",name); + .eq(StringUtils.isNotBlank(name),"cus.custom_name",name) + .in("pay.pay_status",List.of(PayStatusEnum.SUCCESS.getCode(),PayStatusEnum.PAYING.getCode())) + .eq("pay.business_type","2"); Page list = baseMapper.queryRefundList(pageQuery.build(), qw); list.getRecords().forEach(info->{ List payList = queryListByContractCode(info.getContractCode(),null,PayStatusEnum.SUCCESS); diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractPayMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractPayMapper.xml index f2fa931..7ecb7be 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractPayMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractPayMapper.xml @@ -7,10 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"