From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 9c9cb10..67df2c9 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;
@@ -41,6 +42,20 @@
@ApiModelProperty(value = "快过期 1-是 2-否")
private String isInvalid;
+
+ @ApiModelProperty(value = "状态 有效/无效")
+ private String status;
+
+ @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.getDateAfterMonth(new Date(), 1);
@@ -123,4 +138,16 @@
public void setProj(List<ServiceProjVo> proj) {
this.proj = proj;
}
+
+ public String getStatus() {
+ if ("有效".equals(status)) {
+ return "1";
+ } else {
+ return "2";
+ }
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
}
--
Gitblit v1.9.1