From 97048d68c1d9ea928bc2477a682ac71317e36c9b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 22 Mar 2024 14:28:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2082968=20=E6=89=93=E5=8C=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E5=AD=97=E6=AE=B5=E5=92=8C=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pack/mapper/xml/PayPackCompanyMapper.xml  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
index 06110a1b..a6980d04 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
@@ -2,30 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.pack.mapper.PayPackCompanyMapper">
     <select id="queryPackListCount" resultType="com.jero.project.entity.PayCommonProject">
-        SELECT sum(ppr.amount_received) AS paid_amount, ppcp.pack_id AS id FROM pay_pack_company_project ppcp
-        LEFT JOIN pay_payment_record ppr ON ppcp.project_id = ppr.project_id
+        SELECT sum(ppr.amount_received) AS paid_amount, ppc.id AS id FROM pay_pack_company ppc
+        LEFT JOIN pay_payment_record ppr ON ppc.id = ppr.project_id
         <where>
             <if test="listPackIds != null and listPackIds.size() > 0">
-                ppcp.pack_id  in
+                ppc.id  in
                 <foreach collection="listPackIds" item="item" index="index" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
         </where>
-        group by ppcp.pack_id
+        group by ppc.id
     </select>
     <select id="queryConfirmAmount" resultType="com.jero.project.entity.PayCommonProject">
-        SELECT sum(pcpr.amount_received) AS paid_amount, ppcp.pack_id AS id FROM pay_pack_company_project ppcp
-        LEFT JOIN pay_confirm_payment_record pcpr ON ppcp.project_id = pcpr.project_id
+        SELECT sum(pcpr.amount_received) AS paid_amount, ppc.id AS id FROM pay_pack_company ppc
+        LEFT JOIN pay_confirm_payment_record pcpr ON ppc.id = pcpr.project_id
         <where>
             <if test="listPackIds != null and listPackIds.size() > 0">
-                ppcp.pack_id  in
+                ppc.id  in
                 <foreach collection="listPackIds" item="item" index="index" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
         </where>
-        group by ppcp.pack_id
+        group by ppc.id
     </select>
     <select id="queryPageList" resultType="com.jero.pack.entity.PayPackCompany">
         select ppc.*,pcmt.phone,pcmt.email from pay_pack_company ppc
@@ -70,7 +70,7 @@
     </select>
 
     <select id="getSumMoney" resultType="java.lang.String">
-        select sum(pack_charge_total) from pay_pack_company ppc
+        select sum(receivable_amount) from pay_pack_company ppc
         <where>
             <if test="payPackCompany.companyTemporaryName != null and payPackCompany.companyTemporaryName != ''">
                 AND ppc.company_temporary_name like concat('%',concat(#{payPackCompany.companyTemporaryName},'%'))
@@ -83,8 +83,8 @@
 
     <select id="getConfirmAmountMoney" resultType="java.lang.String">
         SELECT sum(ppr.amount_received) FROM
-        pay_pack_company ppc left join pay_pack_company_project ppcp on ppc.id = ppcp.pack_id
-        LEFT JOIN pay_payment_record ppr ON ppcp.project_id = ppr.project_id
+        pay_pack_company ppc
+        LEFT JOIN pay_payment_record ppr ON ppc.id = ppr.project_id
         <where>
             <if test="payPackCompany.companyTemporaryName != null and payPackCompany.companyTemporaryName != ''">
                 AND ppc.company_temporary_name like concat('%',concat(#{payPackCompany.companyTemporaryName},'%'))
@@ -97,8 +97,8 @@
 
     <select id="getComeAllMoney" resultType="java.lang.String">
         SELECT sum(pcpr.amount_received) FROM
-        pay_pack_company ppc left join pay_pack_company_project ppcp on ppc.id = ppcp.pack_id
-        LEFT JOIN pay_confirm_payment_record pcpr ON ppcp.project_id = pcpr.project_id
+        pay_pack_company ppc
+        LEFT JOIN pay_confirm_payment_record pcpr ON ppc.id = pcpr.project_id
         <where>
             <if test="payPackCompany.companyTemporaryName != null and payPackCompany.companyTemporaryName != ''">
                 AND ppc.company_temporary_name like concat('%',concat(#{payPackCompany.companyTemporaryName},'%'))