From 2e3e6c850ad0b531c588a4d7efd42df621d0d518 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 16:45:36 +0800
Subject: [PATCH] modify

---
 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