当月回款统计数据接口开发2

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";
 }

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");

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