From 5e43281d1d7a103c8f211ae5c86df7c89466e13b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 26 Jan 2021 14:16:59 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 6 +++---
1 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..47aae8a 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
@@ -101,11 +101,11 @@
queryUse.setIsOver(Dictionary.FLAG_NO_N);
break;
case "2":
- queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
- queryUse.setIsOver(Dictionary.FLAG_YES_Y);
+ queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1));
+ queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
+ queryUse.setIsOver(Dictionary.FLAG_NO_N);
break;
case "3":
- queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1));
queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
queryUse.setIsOver(Dictionary.FLAG_YES_Y);
break;
--
Gitblit v1.9.1