From a379d9afbf9d23546f92e6c96a51fea56816701c Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Tue, 21 May 2024 16:55:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E4=BD=93=E7=B3=BB=E5=A4=9A=E7=89=88=E6=9C=AC=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 增加历史版本页面生效状态
---
 .../logpm/basicdata/vo/BasicdataPricePageVO.java    |  3 +++
 .../service/impl/BasicdataPriceServiceImpl.java     | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java
index 873848787..bc5c81bf9 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java
@@ -57,6 +57,9 @@ public class BasicdataPricePageVO implements Serializable {
 	@ApiModelProperty(value = "维护状态")
 	private String maintenanceStatus;
 
+	@ApiModelProperty(value = "生效状态")
+	private String effectiveStatus;
+
 	@ApiModelProperty(value = "修改时间")
 	private String updateTime;
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
index 961c150ed..026cf0389 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
@@ -180,11 +180,22 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		if (CollUtil.isNotEmpty(basicdataPriceVOS)) {
 			for (BasicdataPricePageVO basicdataPriceVO : basicdataPriceVOS) {
 				// 维护状态
+				DateTime now = DateUtil.date();
 				if (ObjectUtil.isNotEmpty(basicdataPriceVO.getExpiryTime())) {
-					DateTime now = DateUtil.date();
 					if (now.isAfter(basicdataPriceVO.getExpiryTime())) {
 						// 已到期
 						basicdataPriceVO.setMaintenanceStatus("已过期");
+						basicdataPriceVO.setEffectiveStatus("已失效");
+					}
+				}
+				if (ObjectUtil.isNotEmpty(basicdataPriceVO.getEffectiveTime())) {
+					if (now.isBefore(basicdataPriceVO.getEffectiveTime())) {
+						basicdataPriceVO.setEffectiveStatus("待生效");
+					}
+				}
+				if (ObjectUtil.isAllNotEmpty(basicdataPriceVO.getEffectiveTime(), basicdataPriceVO.getExpiryTime())) {
+					if (now.isIn(basicdataPriceVO.getEffectiveTime(), basicdataPriceVO.getExpiryTime())) {
+						basicdataPriceVO.setEffectiveStatus("生效中");
 					}
 				}
 				// 服务类型