From c5e6a16b70b5d119428fd621bfc2871a94c89d30 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 17 Sep 2021 16:45:39 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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..d0fd4d8 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
@@ -39,9 +39,19 @@
@ApiModelProperty(value = "快过期 1-是 2-否")
private String isInvalid;
+ @ApiModelProperty(value = " 使用情况余额")
+ private Double balance;
+
+ @ApiModelProperty(value = "项目状态 有效/无效")
+ private String status;
+
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";
}
@@ -108,4 +118,24 @@
public void setId(Long id) {
this.id = id;
}
+
+ public String getStatus() {
+ if ("有效".equals(status)) {
+ return "1";
+ } else {
+ return "2";
+ }
+ }
+
+ public Double getBalance() {
+ return balance;
+ }
+
+ public void setBalance(Double balance) {
+ this.balance = balance;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
}
--
Gitblit v1.9.1