From 7823a412b93762490bd6d99027641716599540d7 Mon Sep 17 00:00:00 2001 From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com> Date: Fri, 30 Aug 2024 09:33:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/business/PsContractInfoMapper.xml | 2 +- .../mapper/business/PsContractPayMapper.xml | 2 +- .../resources/mapper/business/PsCustomInfoMapper.xml | 6 +++--- .../resources/mapper/business/PsTaskMainMapper.xml | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml index f3dfa52..d8907f0 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml @@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select info.*, - (select apply_date from ps_contract_info pci where pci.custom_id = info.custom_id order by pci.apply_date limit 0,1) + (select apply_date from ps_contract_info pci where pci.custom_id = info.custom_id and pci.is_cancel != '03' and pci.contract_status != '10' order by pci.apply_date limit 0,1) as first_apply_date, com.id com_id, com.company_name com_company_name, 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 04dbc64..f2fa931 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 @@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select pay.id,pay.money return_money,pay.pay_mode,pay.gath_main,pay.pay_status,pay.pay_certification, com.company_name,cus.custom_name,cus.custom_mobile,cus.custom_manager,info.contract_code,info.pdf_id, (select GROUP_CONCAT(business.business_type SEPARATOR ',') - from ps_contract_business business where business.contract_code = info.contract_code) as business_type_name + from ps_contract_business business where business.contract_code = info.contract_code and business.del_flag = '0') as business_type_name from ps_contract_pay pay left join ps_contract_info info on pay.contract_code = info.contract_code and pay.pay_status in (1,2,3) and pay.business_type = 2 left join ps_company_info com on com.id = info.company_id diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCustomInfoMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCustomInfoMapper.xml index 70da080..b04c6cd 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCustomInfoMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCustomInfoMapper.xml @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" custom.custom_name, custom.custom_mobile, (select GROUP_CONCAT(business.business_type SEPARATOR ',') - from ps_contract_business business where business.contract_code = con.contract_code) as business_type_name, + from ps_contract_business business where business.contract_code = con.contract_code and business.del_flag = '0') as business_type_name, (select max(start_date) from ps_task_main ptm where ptm.contract_code = con.contract_code and ptm.task_type='1' ) start_date, com.finance_account_no, custom.custom_manager, @@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" com.legal_person_idcard, com.legal_person_phone, (select GROUP_CONCAT(appoint.executor SEPARATOR ',') - from ps_task_appoint appoint where appoint.contract_code = con.contract_code) as executors, + from ps_task_appoint appoint where appoint.contract_code = con.contract_code and appoint.appoint_status != '50' and appoint.del_flag = '0') as executors, con.sign_desc, con.contract_amount, con.finish_date, @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ps_custom_info custom left join - (select * from ps_contract_info info where info.create_time in (select max(pci.create_time) create_time from ps_contract_info pci group by pci.custom_id)) + (select * from ps_contract_info info where info.create_time in (select max(pci.create_time) create_time from ps_contract_info pci where coninfo.contract_status != '10' and coninfo.is_cancel != '03' group by pci.custom_id)) con on con.custom_id = custom.id left join ps_company_info com on com.id = con.company_id diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml index 071e2be..d4ff7a7 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml @@ -38,17 +38,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cus.id cus_id, cus.custom_name cus_custom_name , cus.custom_mobile cus_custom_mobile, - (select pta.id from ps_task_appoint pta where pta.task_id=main.id and pta.appoint_type=1 order by id desc limit 0,1) as inAppo, - (select pta.id from ps_task_appoint pta where pta.task_id=main.id and pta.appoint_type=2 order by id desc limit 0,1) as outAppo, - (select pta.id from ps_task_appoint pta where pta.task_id=main.id and pta.appoint_type=3 order by id desc limit 0,1) as secAppo, + (select pta.id from ps_task_appoint pta where pta.task_id=main.id and pta.appoint_type=1 and pta.appoint_status != '50' and pta.del_flag = '0' order by id desc limit 0,1) as inAppo, + (select pta.id from ps_task_appoint pta where pta.task_id=main.id and pta.appoint_type=2 and pta.appoint_status != '50' and pta.del_flag = '0' order by id desc limit 0,1) as outAppo, + (select pta.id from ps_task_appoint pta where pta.task_id=main.id and pta.appoint_type=3 and pta.appoint_status != '50' and pta.del_flag = '0' order by id desc limit 0,1) as secAppo, (CASE WHEN (con.contract_amount - (select IFNULL(sum(money),0) from ps_contract_pay pay where pay.business_type =1 ) + (select IFNULL(sum(money),0) from ps_contract_pay cpay where cpay.business_type =2 ) ) > 0 THEN '半款' ELSE '全款' END) as pay_stauts_desc, (select GROUP_CONCAT(appoint.executor SEPARATOR ',') - from ps_task_appoint appoint where appoint.task_id = main.id) as executors, + from ps_task_appoint appoint where appoint.task_id = main.id and appoint.appoint_status != '50' and appoint.del_flag = '0') as executors, (select GROUP_CONCAT(business.business_type SEPARATOR ',') - from ps_contract_business business where business.contract_code = con.contract_code) as business_type_name + from ps_contract_business business where business.contract_code = con.contract_code and business.del_flag = '0') as business_type_name from ps_task_main main left join ps_contract_info con on main.contract_code = con.contract_code left join ps_company_info com on con.company_id = com.id @@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" appo.id, appo.task_desc, (select GROUP_CONCAT(business.business_type SEPARATOR ',') - from ps_contract_business business where business.contract_code = con.contract_code) as business_type_name + from ps_contract_business business where business.contract_code = con.contract_code and business.del_flag = '0') as business_type_name from ps_task_appoint appo left join ps_task_main main on appo.task_id = main.id and appo.appoint_status != '50' left join ps_contract_info con on main.contract_code = con.contract_code