ccj 1 year ago
parent
commit
01c39fbda7

+ 1 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -193,7 +193,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             Calendar c=Calendar.getInstance();
             Calendar c=Calendar.getInstance();
             c.setTime(new Date());
             c.setTime(new Date());
             if ("一个月".equals(paymentManagement.getDateFilter())) {
             if ("一个月".equals(paymentManagement.getDateFilter())) {
-                c.add(Calendar.DATE, -7);
+                c.add(Calendar.MONTH, -1);
             }
             }
             else if ("三个月".equals(paymentManagement.getDateFilter())) {
             else if ("三个月".equals(paymentManagement.getDateFilter())) {
                 c.add(Calendar.MONTH, -3);
                 c.add(Calendar.MONTH, -3);

+ 2 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -67,7 +67,7 @@
             OR lower( a.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
             OR lower( a.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         </if>
         <if test="dateFilter != null and dateFilter != ''">
         <if test="dateFilter != null and dateFilter != ''">
-            AND (DATE_FORMAT(a.update_date,"%Y%m%d") &gt;=
+            AND (DATE_FORMAT(a.settlement_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{dateFilter},"%Y%m%d"))
             DATE_FORMAT(#{dateFilter},"%Y%m%d"))
         </if>
         </if>
         <if test="startDate != null">
         <if test="startDate != null">
@@ -233,7 +233,7 @@
             OR lower( a.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
             OR lower( a.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         </if>
         <if test="dateFilter != null and dateFilter != ''">
         <if test="dateFilter != null and dateFilter != ''">
-            AND (DATE_FORMAT(a.update_date,"%Y%m%d") &gt;=
+            AND (DATE_FORMAT(a.settlement_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{dateFilter},"%Y%m%d"))
             DATE_FORMAT(#{dateFilter},"%Y%m%d"))
         </if>
         </if>
         <if test="startDate != null">
         <if test="startDate != null">