From b1816792aed91ce4cccc87a759923e3f6dd5018f Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 20 Feb 2021 19:51:48 +0800
Subject: [PATCH] 解决服务单业绩bug
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
index 2937265..13decc4 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
@@ -40,8 +40,12 @@
private String isInvalid;
public String getIsInvalid() {
- Date date = DateUtil.nextNDate(new Date(), 7);
+ Date date = DateUtil.getDateAfterMonth(new Date(), 1);
if (invalidTime != null) {
+ if (new Date().after(invalidTime)) {
+ return "3";
+ }
+
if (date.after(invalidTime)) {
return "1";
}
--
Gitblit v1.9.1