From 85d8a93709e4edd38e2b4900b107ac1d83711f68 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 11:40:09 +0800
Subject: [PATCH] 20210406 活动市场
---
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