From 89bcd2fc777c20701f6e68accd71375b41327b87 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 19 Apr 2021 14:42:35 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 8 ++++---- zq-erp/pom.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml index ed1dc1f..111a11a 100644 --- a/zq-erp/pom.xml +++ b/zq-erp/pom.xml @@ -401,12 +401,12 @@ <exclude>config/xcx/*</exclude> <exclude>config/xcshop/*</exclude> - <!----> + <!-- <exclude>config/config.json</exclude> <exclude>config/application.properties</exclude> <exclude>config/system.properties</exclude> - +--> <exclude>**/*.woff</exclude> <exclude>**/*.woff2</exclude> 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..00c4211 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,20 +98,20 @@ 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 { -- Gitblit v1.9.1