From 4ba3aa03d65333a9e4c6fe2d5b5de6723d10f6f1 Mon Sep 17 00:00:00 2001 From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com> Date: Fri, 6 Sep 2024 15:26:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pusong/business/controller/HomeController.java | 13 ++++++++++++- .../business/domain/bo/PsApproverRecordBo.java | 2 +- .../approver/impl/ApproverAbstractServiceImpl.java | 2 +- .../service/impl/PsCustomInfoServiceImpl.java | 5 ++++- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java index 41ebdd0..3241c13 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java @@ -36,7 +36,7 @@ public class HomeController extends BaseController { private final HomeService homeService; /** - * 首页大盘数据 + * 首页大盘数据:本月成交总金额 * @param type 1本月 2上月 3本季度 4本年 5所有 * @return */ @@ -46,5 +46,16 @@ public class HomeController extends BaseController { return R.ok(homeService.selectMakeAmount(type)); } +// /** +// * 首页大盘数据:本月回款情况 +// * @param type 1本月 2上月 3本季度 4本年 5所有 +// * @return +// */ +// @SaCheckPermission("business:salary:list") +// @GetMapping("/returnMoney") +// public R selectMakeAmount(@RequestParam() Integer type) { +// return R.ok(homeService.selectMakeAmount(type)); +// } + } 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 629ed47..1bb38fb 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,7 @@ public class PsApproverRecordBo { /** * 客户姓名 */ - private String customName; + private String customerName; /** * 客户电话 */ 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 3d66105..099225f 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 @@ -93,7 +93,7 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService { .eq(bo.getId()!=null,"app.id",bo.getId()) .eq("app.del_flag","0") .like(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus()) - .like(StringUtils.isNotBlank(bo.getCustomName()),"cus.custom_name",bo.getCustomName()) + .like(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName()) .like(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName()) //销售经理姓名 .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()+"%'") diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java index 33975dd..30a264b 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java @@ -370,7 +370,10 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { qw.exists(StringUtils.isNotBlank(queryBo.getCustomIntroducerName()),"select 1 from ps_custom_info pc where pc.id = custom.custom_introducer and pc.custom_name like '%"+queryBo.getCustomIntroducerName()+"%'"); qw.exists(StringUtils.isNotBlank(queryBo.getCustomManagerName()),"select 1 from sys_user su where su.user_id = custom.custom_manager and su.nick_name like '%"+queryBo.getCustomManagerName()+"%'"); if(queryBo.getType() !=null && queryBo.getType() == 2){ - qw.eq("con.contract_status", ContractStatusEnum.SUCCESS.getCode()); +// qw.eq("con.contract_status", ContractStatusEnum.SUCCESS.getCode()); + //已完成合同列表:客户下不存在未完成的合同信息(不包括作废和暂存的合同) + qw.notExists("select 1 from ps_contract_info pscon where pscon.custom_id = custom.id and pscon.contract_status not in ('"+ContractStatusEnum.SUCCESS.getCode()+"','" + +ContractStatusEnum.INIT.getCode()+"' and pscon.is_cancel != '03')"); }else if (queryBo.getType() !=null && queryBo.getType() == 1) { //托管类服务类型编码集合 qw.exists(queryBo.getServiceType() !=null && queryBo.getServiceType() == 1, "select 1 from ps_contract_business bus " +