From d388e2788b7ef088d7cd40f901b0acdcec460bc3 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 01 Apr 2021 00:19:23 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 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 bbe4758..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
@@ -14,6 +14,9 @@
@ApiModel(value = "ServiceProjVo", description = "用户项目返回参数类")
public class ServiceProjVo {
+ @ApiModelProperty(value = "id")
+ private Long id;
+
@ApiModelProperty(value = "订单ID")
private Long projId;
@@ -23,7 +26,7 @@
@ApiModelProperty(value = "时长")
private Integer timeLength;
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
@ApiModelProperty(value = "有效期")
private Date invalidTime;
@@ -32,6 +35,27 @@
@ApiModelProperty(value = "图片")
private String img;
+
+ @ApiModelProperty(value = "快过期 1-是 2-否")
+ private String isInvalid;
+
+ public String getIsInvalid() {
+ Date date = DateUtil.getDateAfterMonth(new Date(), 1);
+ if (invalidTime != null) {
+ if (new Date().after(invalidTime)) {
+ return "3";
+ }
+
+ if (date.after(invalidTime)) {
+ return "1";
+ }
+ }
+ return "2";
+ }
+
+ public void setIsInvalid(String isInvalid) {
+ this.isInvalid = isInvalid;
+ }
public String getName() {
return name;
@@ -80,4 +104,12 @@
public void setImg(String img) {
this.img = img;
}
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
}
--
Gitblit v1.9.1