From 4e01be740163c04e873e23b1457f6900ae3878a8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 14:51:25 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java | 15 +++++++++++++++
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java | 17 +++++++++++++++++
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 17 +++++++++++++++++
3 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
new file mode 100644
index 0000000..4df3fd4
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
@@ -0,0 +1,15 @@
+package com.matrix.system.app.action;
+
+import com.matrix.core.pojo.AjaxResult;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author wzy
+ * @date 2020-12-27
+ **/
+@Api(value = "ApiStoreAction", tags = "库存管理接口类")
+@RequestMapping(value = "/api/store")
+public class ApiStoreAction {
+
+}
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 a6ae967..2937265 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
@@ -36,6 +36,23 @@
@ApiModelProperty(value = "图片")
private String img;
+ @ApiModelProperty(value = "快过期 1-是 2-否")
+ private String isInvalid;
+
+ public String getIsInvalid() {
+ Date date = DateUtil.nextNDate(new Date(), 7);
+ if (invalidTime != null) {
+ if (date.after(invalidTime)) {
+ return "1";
+ }
+ }
+ return "2";
+ }
+
+ public void setIsInvalid(String isInvalid) {
+ this.isInvalid = isInvalid;
+ }
+
public String getName() {
return name;
}
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 0d8ab6a..eb8b2c5 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
@@ -39,6 +39,23 @@
@ApiModelProperty(value = "套餐内产品")
List<ServiceProjVo> proj;
+ @ApiModelProperty(value = "快过期 1-是 2-否")
+ private String isInvalid;
+
+ public String getIsInvalid() {
+ Date date = DateUtil.nextNDate(new Date(), 7);
+ if (invalidTime != null) {
+ if (date.after(invalidTime)) {
+ return "1";
+ }
+ }
+ return "2";
+ }
+
+ public void setIsInvalid(String isInvalid) {
+ this.isInvalid = isInvalid;
+ }
+
public Long getId() {
return id;
}
--
Gitblit v1.9.1