From a27768e7b484cc20bf0dcdb699318ae9725e0dd8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 21 Jan 2021 11:48:08 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java |    4 ++--
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml              |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index 6aef14b..465715d 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -106,8 +106,8 @@
                     break;
                 case "3":
                     queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1));
-                    queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
-                    queryUse.setIsOver(Dictionary.FLAG_YES_Y);
+                    queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
+                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
                     break;
                 default:
                     queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index 4ec9f20..18c9fa7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -375,7 +375,7 @@
                 and a.FAIL_TIME = #{record.failTime}
             </if>
             <if test="record.targetFailTime != null  ">
-                and date_format(#{record.failTime}, '%Y-%m-%d') > date_format(a.FAIL_TIME, '%Y-%m-%d')
+                and date_format(#{record.targetFailTime}, '%Y-%m-%d') > date_format(a.FAIL_TIME, '%Y-%m-%d')
             </if>
             <if test="record.price != null and record.price !='' ">
                 and a.PRICE = #{record.price}

--
Gitblit v1.9.1