From 8a7f5e5ee757912c7d45c40fe764036d5d8bfe18 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 20 Oct 2022 16:51:32 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=9C=AA=E6=94=B6=E8=B4=A6=E6=AC=BE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/index/service/IndexService.java  | 13 +++---
 .../project/mapper/PayWorkingGroupMapper.java |  1 -
 .../mapper/xml/PayWorkingGroupMapper.xml      | 40 +++++--------------
 3 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
index 35ab70da..c4ccf2ec 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
@@ -281,15 +281,14 @@ public class IndexService {
 
     private UncollectedPieChartVO setUncollectedPieChartVO(String name, Integer start, Integer end, String departCode){
         BigDecimal bigDecimal = payWorkingGroupMapper.invoiceAmount(start, end, departCode);
-        BigDecimal bigDecimal1 = payWorkingGroupMapper.arrivalAmount(start, end, departCode);
         UncollectedPieChartVO uncollectedPieChartVO = new UncollectedPieChartVO();
         uncollectedPieChartVO.setName(name);
-        if (bigDecimal.compareTo(bigDecimal1) > 0){
-            BigDecimal subtract = bigDecimal.subtract(bigDecimal1);
-            uncollectedPieChartVO.setMoney(String.valueOf(subtract));
-        }else {
-            uncollectedPieChartVO.setMoney("0");
-        }
+        //if (bigDecimal.compareTo(bigDecimal1) > 0){
+        //    BigDecimal subtract = bigDecimal.subtract(bigDecimal1);
+        uncollectedPieChartVO.setMoney(String.valueOf(bigDecimal));
+        //}else {
+        //    uncollectedPieChartVO.setMoney("0");
+        //}
         return uncollectedPieChartVO;
     }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
index e192f61d..adee0d01 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
@@ -248,5 +248,4 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
 
     BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode);
 
-    BigDecimal arrivalAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index f5fdcf47..9ba17bba 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -2701,12 +2701,13 @@
     </select>
 
     <select id="invoiceAmount" resultType="java.math.BigDecimal">
-        SELECT IFNULL(sum(pmbp.invoice_amount),0)
-        FROM pay_mail_bill pmb
-        left join pay_mail_bill_project pmbp on pmb.id = pmbp.bill_id
-        <if test="departCode != null and departCode != ''">
-            left join v_statistical v on v.projectId = pmbp.project_id
-        </if>
+        select
+        IFNULL(sum(money),0) from
+        (
+        SELECT distinct v.projectId, billMoney - ifnull(comeAllMoney,0) money
+        FROM v_statistical v
+        left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id
+        left join pay_mail_bill pmb on pmb.id = pmbp.bill_id
         <where>
             <if test="end != null">
                 bill_date >= DATE_SUB(CURDATE(), INTERVAL #{end} DAY)
@@ -2720,29 +2721,10 @@
             <if test="departCode != null and departCode != ''">
                 and departCode = #{departCode}
             </if>
+            <!-- 开票未来款 -->
+            AND (comeAllMoney <![CDATA[<]]> billMoney or
+            (comeAllMoney is null and billMoney is not null and billMoney !=0))
         </where>
-    </select>
-
-    <select id="arrivalAmount" resultType="java.math.BigDecimal">
-        SELECT IFNULL(sum(amount_received),0)
-        FROM pay_payment_record ppr
-        <if test="departCode != null and departCode != ''">
-            left join v_statistical v on v.projectId = ppr.project_id
-        </if>
-        <where>
-            <if test="end != null">
-                payment_date >= DATE_SUB(CURDATE(), INTERVAL #{end} DAY)
-            </if>
-            <if test="start != null">
-                AND payment_date <![CDATA[<=]]> DATE_SUB(CURDATE(), INTERVAL #{start} DAY)
-            </if>
-            <if test="start == null">
-                AND payment_date <![CDATA[<=]]> CURDATE()
-            </if>
-            <if test="departCode != null and departCode != ''">
-                and departCode = #{departCode}
-            </if>
-            and payment_status = 'completed'
-        </where>
+        ) a
     </select>
 </mapper>