From 6ada97d503bd93722c081b66a9adcce7599e5536 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 14 Apr 2021 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
index eb8b2c5..1c61e6d 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.tools.DateUtil;
+import com.matrix.system.hive.bean.SysProjUse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -42,9 +43,24 @@
@ApiModelProperty(value = "快过期 1-是 2-否")
private String isInvalid;
+ @ApiModelProperty(hidden = true)
+ private List<SysProjUse> taocanProjUse;
+
+ public List<SysProjUse> getTaocanProjUse() {
+ return taocanProjUse;
+ }
+
+ public void setTaocanProjUse(List<SysProjUse> taocanProjUse) {
+ this.taocanProjUse = taocanProjUse;
+ }
+
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