From 9bd687944c5914a08e8f418ad023e4f6df86419c Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 9 Sep 2025 09:30:54 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E8=A7=81=E7=82=B9=E5=A5=96=E8=80=83?=
 =?UTF-8?q?=E6=A0=B8=E6=B7=BB=E5=8A=A0=E5=A4=8D=E8=B4=AD=E8=80=83=E6=A0=B8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java     | 4 +++-
 .../com/hzs/bonus/achieve/service/ICuMemberTreeService.java  | 2 +-
 .../bonus/achieve/service/impl/CuMemberTreeServiceImpl.java  | 4 ++--
 .../bonus/detail/service/impl/CuMemberAssessServiceImpl.java | 2 +-
 .../resources/mapper/bonus/achieve/CuMemberTreeMapper.xml    | 5 ++++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java
index 38f5f889..50bc5710 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java
@@ -333,7 +333,9 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
      * @param assessTableName
      * @return
      */
-    int updateCuMemberSettlePointAssess(@Param("settleTableName") String settleTableName, @Param("assessTableName") String assessTableName);
+    int updateCuMemberSettlePointAssess(@Param("settleTableName") String settleTableName,
+                                        @Param("assessTableName") String assessTableName,
+                                        @Param("settleDate") String settleDate);
 
     /**
      * 初始化考核数据
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java
index d3fa16f8..b78813fc 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java
@@ -339,7 +339,7 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
      * @param settleTableName
      * @param assessTableName
      */
-    void updateCuMemberSettlePointAssess(String settleTableName, String assessTableName);
+    void updateCuMemberSettlePointAssess(String settleTableName, String assessTableName, String settleDate);
 
     /**
      * 初始化考核数据
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java
index b1d22d5c..2bdf4de7 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java
@@ -436,8 +436,8 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
     }
 
     @Override
-    public void updateCuMemberSettlePointAssess(String settleTableName, String assessTableName) {
-        baseMapper.updateCuMemberSettlePointAssess(settleTableName, assessTableName);
+    public void updateCuMemberSettlePointAssess(String settleTableName, String assessTableName, String settleDate) {
+        baseMapper.updateCuMemberSettlePointAssess(settleTableName, assessTableName, settleDate);
     }
 
     @Override
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java
index e4137447..f4fe0d49 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java
@@ -426,7 +426,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
         // 初始化考核数据
         iCuMemberTreeService.initAssessDate(currentSettleTableName);
         // 更新日结表会员免考信息
-        iCuMemberTreeService.updateCuMemberSettlePointAssess(currentSettleTableName, assessTableName);
+        iCuMemberTreeService.updateCuMemberSettlePointAssess(currentSettleTableName, assessTableName, settleDate);
     }
 
     @Override
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
index 8ffd3a45..310c48ef 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
@@ -1185,7 +1185,10 @@
                    from ${assessTableName} cma
                    where cma.del_flag = 0
                      and cma.assess_type = 5
-                     and cma.assess_status in (0, 1)) tmp
+                     and cma.assess_status in (0, 1)
+                     and to_date(#{settleDate}, 'yyyy-mm-dd') >= cma.start_date
+                     and cma.end_date >= to_date(#{settleDate}, 'yyyy-mm-dd')
+            ) tmp
             on (tmp.pk_member = cms.pk_member)
             when matched then
                 update set cms.is_maker_space = 0