From 677fedb6c232c914c5b2eb1a6d574cc57421ae7d Mon Sep 17 00:00:00 2001 From: mx <1@qq.com> Date: Wed, 9 Apr 2025 12:45:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E8=80=81=E8=B4=A6=E6=96=B0=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/PsContractInfoServiceImpl.java | 2 +- .../src/main/resources/mapper/business/PsTaskMainMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 ff8d76c..1b0dd13 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 @@ -410,7 +410,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { } QueryWrapper lqw = buildQueryWrapper(bo); if (bo.getAllReturn() != null){ - String sql = "IFNULL((select sum(money) from ps_contract_pay where contract_code = info.contract_code and pay_status = 1 and business_type = 1),0) - IFNULL((select sum(money) from ps_contract_pay where contract_code = info.contract_code and pay_status = 1 and business_type = 2),0)"; + String sql = "IFNULL((select sum(money) from ps_contract_pay where contract_code = info.contract_code and pay_status = '1' and business_type = '1'),0) - IFNULL((select sum(money) from ps_contract_pay where contract_code = info.contract_code and pay_status = '1' and business_type = '2'),0)"; if (bo.getAllReturn() == 1){ lqw.apply("info.contract_amount <= " + sql); } else if (bo.getAllReturn() == 0) { 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 f7f2386..c62859a 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 @@ -37,7 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" con.contract_amount con_contract_amount, con.custom_scene con_custom_scene, con.sign_desc con_sign_desc, - con.is_old con_is_old, con.roll_back_pdf con_roll_back_pdf, scom.id scom_id, scom.company_adress scom_company_adress, @@ -73,7 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -- (select GROUP_CONCAT(appoint.executor SEPARATOR ',') 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(appoint.task_desc SEPARATOR ',') from ps_task_appoint appoint where appoint.task_id = main.id and appoint.appoint_status != '50' and appoint.del_flag = '0') as taskDesc, (select GROUP_CONCAT(business.business_type SEPARATOR ',') from ps_contract_business business where business.contract_code = con.contract_code and business.company_id = main.service_company_id and business.del_flag = '0') as business_type_name, - (select 1 from ps_contract_business business2 where business2.contract_code = con.contract_code and business2.company_id = main.service_company_id and business2.del_flag = '0' and business2.is_proxy = '1' limit 1) as scom_is_proxy + (select 1 from ps_contract_business business2 where business2.contract_code = con.contract_code and business2.company_id = main.service_company_id and business2.del_flag = '0' and business2.is_proxy = '1' limit 1) as scom_is_proxy, + (select 1 from ps_contract_business business2 where business2.contract_code = con.contract_code and business2.company_id = main.service_company_id and business2.del_flag = '0' and business2.is_old = 'true' limit 1) as con_is_old from ps_task_main main left join ps_contract_info con on main.contract_code = con.contract_code left join ps_company_info scom on main.service_company_id = scom.id