From 12f3d30db97ee40b628b34fe97d6a03f5704a3dc Mon Sep 17 00:00:00 2001
From: LIUFL <fulinemail@163.com>
Date: Tue, 10 Sep 2024 14:50:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E6=9C=88=E5=9B=9E=E6=AC=BE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/pusong/common/core/constant/CacheNames.java | 6 ++++--
 .../pusong/business/service/impl/HomeServiceImpl.java    | 6 ++++++
 .../resources/mapper/business/PsContractInfoMapper.xml   | 9 +++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java
index 17bb405..a11ad08 100644
--- a/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java
+++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java
@@ -76,6 +76,8 @@ public interface CacheNames {
      * 首页查询(成交金额)
      */
     String HOME_A = "home_queryA#60s";
-
-
+    /**
+     * 首页查询(回款统计与合同)
+     */
+    String HOME_B = "home_queryB#60s";
 }
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java
index 3498bb3..34c5c12 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java
@@ -137,6 +137,12 @@ public class HomeServiceImpl implements HomeService {
         return map;
     }
 
+    /**
+     * 回款信息统计
+     * @param type
+     * @return
+     */
+    @Cacheable(cacheNames = CacheNames.HOME_B, key = "#type")
     public ReturnMoneyInfoVo returnMoney(Integer type){
         Map<String, Object> mapParam = this.getDate(type);
         LocalDate startDate = (LocalDate)mapParam.get("startDate");
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 36dbb18..3aacccd 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
@@ -70,11 +70,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             pay.business_type,
             info.apply_date
         FROM ps_contract_info info
-        LEFT JOIN ps_contract_pay pay on pay.contract_code=info.contract_code and pay.pay_status=#{queryParam.payStatus}
+        LEFT JOIN ps_contract_pay pay on
+                pay.contract_code=info.contract_code and
+                pay.pay_status=#{queryParam.payStatus} and
+                pay.del_flag=0
 
         WHERE
+        <if test="queryParam.startDate != null">
             info.apply_date >= #{queryParam.startDate} and
-        <if test="queryParam.endDate != null and queryParam.endDate !=''">
+        </if>
+        <if test="queryParam.endDate != null">
             info.apply_date &lt;= #{queryParam.endDate} and
         </if>
             info.contract_status != #{queryParam.contractStatus} and