From 3a32fd808c61d81b9b8ab1479ebfe156caff4ad2 Mon Sep 17 00:00:00 2001 From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com> Date: Fri, 30 Aug 2024 16:48:43 +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 --- .../business/controller/PsCustomController.java | 16 ++++++++++++++++ .../domain/bo/PsCustomRecordQueryBo.java | 5 +++++ .../service/impl/PsContractInfoServiceImpl.java | 4 ++-- .../service/impl/PsCustomInfoServiceImpl.java | 9 +++++++-- .../business/service/impl/PsTaskServiceImpl.java | 4 ++-- 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java index acab732..a1054f8 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java @@ -58,6 +58,22 @@ public class PsCustomController extends BaseController { public TableDataInfo list(PsCustomInfoBo bo, PageQuery pageQuery) { return psCustomInfoService.queryPageList(bo, pageQuery); } + +// /** +// * 导出客户基本信息列表 +// */ +// @SaCheckPermission("business:customInfo:export") +// @Log(title = "客户基本信息", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(PsCustomInfoBo bo, HttpServletResponse response) { +// //todo 导出接口 +// PageQuery pageQuery = new PageQuery(); +// pageQuery.setPageNum(1); +// pageQuery.setPageSize(100000); +// TableDataInfo list = psCustomInfoService.queryPageList(bo,pageQuery); +// ExcelUtil.exportExcel(list, "客户基本信息", PsCustomInfoVo.class, response); +// } + /** * 新增客户基本信息 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomRecordQueryBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomRecordQueryBo.java index 5745d00..6cfe257 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomRecordQueryBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomRecordQueryBo.java @@ -36,6 +36,11 @@ public class PsCustomRecordQueryBo { */ private String name; + /** + * 客户经理名称 + */ + + private String customerManagerName; /** * 客户电话客户电话(多个用英文逗号分割) */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java index fc5ec5e..488cfaa 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java @@ -596,8 +596,8 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { "where bus.contract_code = info.contract_code and bus.business_type != 2"); } //服务项目编码集合 - qw.exists(CollectionUtils.isNotEmpty(bo.getServiceProjects()), "select 1 from ps_contract_business_detail detail " + - "where detail.contract_code = info.contract_code and detail.business_project in ("+StringUtils.join(bo.getServiceProjects(),",")+")");//服务项目编码集合 + qw.exists(CollectionUtils.isNotEmpty(bo.getServiceProjects()), "select 1 from ps_contract_business detail " + + "where detail.contract_code = info.contract_code and detail.business_type in ("+StringUtils.join(bo.getServiceProjects(),",")+")");//服务项目编码集合 qw.between(bo.getMoneyEnd() != null && bo.getMoneyStart() !=null,"info.contract_amount",bo.getMoneyStart(),bo.getMoneyEnd()); qw.orderByDesc("info.create_time"); 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 1cab2ed..db8680f 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 @@ -359,10 +359,15 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { public TableDataInfo getCustomerRecordList(PsCustomRecordQueryBo queryBo, PageQuery pageQuery){ QueryWrapper qw = Wrappers.query(); qw.like(StringUtils.isNotBlank(queryBo.getCompanyName()), "com.company_name", queryBo.getCompanyName()); + qw.like(StringUtils.isNotBlank(queryBo.getFinanceAccountNo()), "com.finance_account_no", queryBo.getFinanceAccountNo()); + qw.like(StringUtils.isNotBlank(queryBo.getLegalPersonName()), "com.legal_person_name", queryBo.getLegalPersonName()); + qw.eq(queryBo.getId() != null,"custom.id",queryBo.getId()); qw.like(StringUtils.isNotBlank(queryBo.getName()), "custom.custom_name", queryBo.getName()); qw.like(StringUtils.isNotBlank(queryBo.getMobile()), "custom.custom_mobile", queryBo.getMobile()); qw.notIn("con.contract_status", ContractStatusEnum.isValid()); + + qw.exists(StringUtils.isNotBlank(queryBo.getCustomerManagerName()),"select 1 from sys_user su where su.user_id = custom.custom_manager and su.nick_name like %"+queryBo.getCustomerManagerName()+"%"); if(queryBo.getType() !=null && queryBo.getType() == 2){ qw.eq("con.contract_status", ContractStatusEnum.SUCCESS.getCode()); }else if (queryBo.getType() !=null && queryBo.getType() == 1) { @@ -373,8 +378,8 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { qw.exists(queryBo.getServiceType() !=null && queryBo.getServiceType() == 2, "select 1 from ps_contract_business bus " + "where bus.contract_code = con.contract_code and bus.business_type != 2"); //服务项目编码集合 - qw.exists(CollectionUtils.isNotEmpty(queryBo.getServiceProjects()), "select 1 from ps_contract_business_detail detail " + - "where detail.contract_code = con.contract_code and detail.business_project in ("+StringUtils.join(queryBo.getServiceProjects(),",")+")");//服务项目编码集合 + qw.exists(CollectionUtils.isNotEmpty(queryBo.getServiceProjects()), "select 1 from ps_contract_business detail " + + "where detail.contract_code = con.contract_code and detail.business_type in ("+StringUtils.join(queryBo.getServiceProjects(),",")+")");//服务项目编码集合 } Page list = baseMapper.selectPageCustomerRecordList(pageQuery.build(), qw); if(CollectionUtils.isEmpty(list.getRecords())){ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java index 5f8bc60..00d8953 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java @@ -409,8 +409,8 @@ public class PsTaskServiceImpl implements IPsTaskService { lqw.like(StringUtils.isNotBlank(bo.getIdNo()), "com.legal_person_idcard", bo.getIdNo());//法人身份证 lqw.like(StringUtils.isNotBlank(bo.getName()), "com.legal_person_name", bo.getName());//法人姓名 //服务项目编码集合 - lqw.exists(CollectionUtils.isNotEmpty(bo.getServiceProjectCode()), "select 1 from ps_contract_business_detail detail " + - "where detail.contract_code = con.contract_code and detail.business_project in ("+StringUtils.join(bo.getServiceProjectCode(),",")+")");//服务项目编码集合 + lqw.exists(CollectionUtils.isNotEmpty(bo.getServiceProjectCode()), "select 1 from ps_contract_business detail " + + "where detail.contract_code = con.contract_code and detail.business_type in ("+StringUtils.join(bo.getServiceProjectCode(),",")+")");//服务项目编码集合 //执行者姓名 lqw.exists(StringUtils.isNotBlank(bo.getExecutor()), "select 1 from ps_task_appoint appoint,sys_user su " + "where appoint.executor = su.user_id and appoint.task_id = main.id and su.nick_name like '%" + bo.getExecutor() + "%'");