From 959d8559e2d66f8508d6f8992775e75fc186694a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 28 Mar 2024 10:10:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=2083173=20=E4=BC=9A=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=96=B0=E5=A2=9E=E5=8D=95=E4=BD=8D=E5=90=8E?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=90=8E--=E6=9D=83=E7=9B=8A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/member/service/ITbMemberProjectSubitemService.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
index 4d924efb..47cc1674 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
@@ -673,9 +673,11 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 	 * 处理数据
 	 */
 	private void processData(TbMemberProjectSubitem record){
+		Date effectiveDate = record.getEffectiveDate();
 		Date invalidationDate = record.getInvalidationDate();
 		//如果当前日期大于失效日期，返回失效
-		if (DateUtil.compare(DateUtil.date(),invalidationDate) > 0){
+		DateTime date = DateUtil.date();
+		if (DateUtil.isIn(date,effectiveDate,invalidationDate)){
 			record.setEquityStatus(TAKE_EFFECT);
 		}else {
 			record.setEquityStatus(INVALID);