From 3b21dd9a4177b6f27b3b129fef707073ef1c2ec4 Mon Sep 17 00:00:00 2001
From: mx <1289317512@qq.com>
Date: Thu, 31 Oct 2024 15:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BC=81=E4=B8=9A=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/domain/bo/PsCompanyQueryBo.java    |  2 +-
 .../service/impl/PsCompanyInfoServiceImpl.java  | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java
index 359f266..5248cb1 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java
@@ -39,7 +39,7 @@ public class PsCompanyQueryBo {
     /**
      * 客户电话
      */
-    private String customMobile;
+    private String mobile;
     /**
      * 公司名称
      */
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java
index eca1493..0a8d205 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java
@@ -120,7 +120,7 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
         lqw.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()+"%'");
         lqw.eq(bo.getId() != null,"com.id",bo.getId());
         lqw.like(bo.getCustomName() != null,"cus.custom_name",bo.getCustomName());
-        lqw.like(bo.getCustomMobile() != null,"cus.custom_mobile",bo.getCustomMobile());
+        lqw.like(bo.getMobile() != null,"cus.custom_mobile",bo.getMobile());
         lqw.like(bo.getCompanyName() != null,"com.company_name",bo.getCompanyName());
         lqw.like(bo.getCompanyName() != null,"com.company_name",bo.getCompanyName());
         lqw.like(bo.getCustomIntroducer() != null,"cusi.custom_name",bo.getCustomIntroducer());
@@ -138,13 +138,18 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
         lqw.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()+"%'");
         lqw.eq(bo.getId() != null,"com.id", bo.getId());
         lqw.eq("com.company_type", "2");
-        lqw.like(bo.getCustomName() != null,"cus.custom_name",bo.getCustomName());
-        lqw.like(bo.getCustomMobile() != null,"cus.custom_mobile",bo.getCustomMobile());
-        lqw.like(bo.getCompanyName() != null,"com.company_name",bo.getCompanyName());
-        lqw.eq(bo.getServiceStatus() != null,"com.service_status",bo.getServiceStatus());
+        lqw.like(bo.getCustomName() != null,"cus.custom_name", bo.getCustomName());
+        lqw.like(bo.getMobile() != null,"com.contact_person_phone", bo.getMobile());
+        lqw.like(bo.getCompanyName() != null,"com.company_name", bo.getCompanyName());
+        lqw.eq(bo.getServiceStatus() != null,"com.service_status", bo.getServiceStatus());
         lqw.exists(StringUtils.isNotBlank(bo.getUserName()),"select 1 from sys_user fsu  LEFT JOIN ps_company_follow cf on com.id = cf.company_id where fsu.user_id = cf.user_id and fsu.nick_name like '%"+bo.getUserName()+"%'");
-        lqw.exists("select 1 FROM ps_contract_company cc inner join ps_contract_pay pay on pay.contract_code = cc.contract_code where cc.company_id = com.id");
 
+        //合同未作废，有回款的续费合同  或   合同未作废有完成主任务的
+        lqw.and( wrapper -> wrapper
+                .exists("select 1 FROM ps_contract_company cc inner join ps_contract_pay pay on pay.contract_code = cc.contract_code inner join ps_contract_info con on con.contract_code = cc.contract_code where \t\tcc.company_id = com.id and con.is_due = '1' and con.is_cancel != '03'")
+                .or()
+                .exists("select 1 FROM ps_task_main task inner join ps_contract_info con on con.contract_code = task.contract_code where task.service_company_id = com.id and task.del_flag = 0 and task.\t\t\t  \t  task_status = '30'  and con.is_cancel != '03'")
+        );
 
         StringBuilder sql = new StringBuilder("select 1 from ps_contract_business cb where cb.company_id = com.id ");
         if (bo.getType() == 2){  //非托管