From 1a9b054b95eb864d1ae7d90d1dfbb497ca1db62a Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 04 Sep 2021 18:12:12 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 818338b..73fe8c5 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
@@ -98,25 +98,24 @@
break;
case "1":
queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
- queryUse.setIsOver(Dictionary.FLAG_NO_N);
+// queryUse.setIsOver(Dictionary.FLAG_NO_N);
break;
case "2":
queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1));
queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
- queryUse.setIsOver(Dictionary.FLAG_NO_N);
+// queryUse.setIsOver(Dictionary.FLAG_NO_N);
break;
case "3":
queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
- queryUse.setIsOver(Dictionary.FLAG_YES_Y);
+// queryUse.setIsOver(Dictionary.FLAG_YES_Y);
break;
default:
queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
- queryUse.setIsOver(Dictionary.FLAG_NO_N);
+// queryUse.setIsOver(Dictionary.FLAG_NO_N);
break;
}
} else {
queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
- queryUse.setIsOver(Dictionary.FLAG_NO_N);
}
queryUse.setQueryKey(serviceVipProjDto.getQueryKey());
--
Gitblit v1.9.1