From 3ab20a42e521a4b640e0e75d5be88230a7eff921 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Mon, 9 Dec 2024 13:09:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=89=A7=E8=A1=8C=E5=90=8E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/system/att/dao/OrgChangeDao.java | 2 ++
 .../main/java/com/bonus/system/att/entity/OrgChangeBean.java | 4 ++++
 .../java/com/bonus/system/att/service/OrgChangeService.java  | 2 ++
 .../com/bonus/system/att/service/OrgChangeServiceImpl.java   | 5 +++++
 .../main/java/com/bonus/system/att/tasks/HolidayTasks.java   | 4 +++-
 .../src/main/resources/mapper/att/OrgChangeMapper.xml        | 4 +++-
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/OrgChangeDao.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/OrgChangeDao.java
index abde570..e63a0f3 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/OrgChangeDao.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/OrgChangeDao.java
@@ -68,4 +68,6 @@ public interface OrgChangeDao {
     void updateOrgByUserId(OrgChangeBean item);
 
     void updateAttGroupByUserId(OrgChangeBean item);
+
+    void updateOrgChangeIsApply(OrgChangeBean item);
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/OrgChangeBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/OrgChangeBean.java
index e5365bb..e1dc465 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/OrgChangeBean.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/OrgChangeBean.java
@@ -142,5 +142,9 @@ public class OrgChangeBean {
      */
     private String exportType;
 
+    /**
+     * 是否已经应用
+     */
+    private String isApply;
 
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeService.java
index 79ae1e2..d646a84 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeService.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeService.java
@@ -61,4 +61,6 @@ public interface OrgChangeService {
     void updateOrgByUserId(OrgChangeBean item);
 
     void updateAttGroupByUserId(OrgChangeBean item);
+
+    void updateOrgChangeIsApply(OrgChangeBean item);
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java
index 81db8e5..61b2366 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java
@@ -111,5 +111,10 @@ public class OrgChangeServiceImpl implements OrgChangeService {
         orgChangeDao.updateAttGroupByUserId(item);
     }
 
+    @Override
+    public void updateOrgChangeIsApply(OrgChangeBean item) {
+        orgChangeDao.updateOrgChangeIsApply(item);
+    }
+
 
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/HolidayTasks.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/HolidayTasks.java
index fdda470..151799b 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/HolidayTasks.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/HolidayTasks.java
@@ -79,7 +79,7 @@ public class HolidayTasks {
         bean.setIsCheck("1");
         //查询审核通过的
         List<OrgChangeBean> list = orgChangeService.selectOrgChangeList(bean);
-        list.forEach(item -> {
+        list.stream().filter(item -> "0".equals(item.getIsApply())).forEach(item -> {
             Date changeEffectiveDate = item.getChangeEffectiveDate();
             // 将 Date 转换为 Instant
             Instant changeEffectiveInstant = changeEffectiveDate.toInstant();
@@ -91,6 +91,8 @@ public class HolidayTasks {
                 if ("1".equals(item.getIsChangeAttGroup())){
                     orgChangeService.updateAttGroupByUserId(item);
                 }
+                item.setIsApply("1");
+                orgChangeService.updateOrgChangeIsApply(item);
             }
         });
     }
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml
index 7828f8d..6463465 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml
@@ -124,5 +124,7 @@
     <update id="updateAttGroupByUserId">
         update att_group_person_relation set group_id = #{newAttGroup},org_id = #{newOrgId} where user_id = #{userId} and group_id = #{oldAttGroup}
     </update>
-
+    <update id="updateOrgChangeIsApply">
+        update org_change set is_apply = #{isApply} where id = #{id}
+    </update>
 </mapper>
\ No newline at end of file