From 724e3a6aad6ae898ade94f6402091af6a40b1bde Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Thu, 6 Mar 2025 10:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=96=E5=87=BA=E5=8A=A0?=
 =?UTF-8?q?=E5=9F=B9=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/manager/entity/HolidayBean.java   |  5 ++++
 .../service/impl/WeChatServiceImpl.java       | 25 ++++++++++++++++---
 .../resources/mappers/wechat/WeChatMapper.xml | 11 +++++++-
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java b/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java
index 71a3210..f8a989d 100644
--- a/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java
+++ b/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java
@@ -61,6 +61,11 @@ public class HolidayBean {
      * 请假开始时段1上午2下午
      */
     private String leaveStartInterval;
+
+    /**
+     * 是否培训 1上午2下午
+     */
+    private String isTrain;
     /**
      * 请假结束日期
      */
diff --git a/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java b/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java
index ae2ec80..86e3c81 100644
--- a/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java
+++ b/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java
@@ -197,7 +197,15 @@ public class WeChatServiceImpl implements WeChatService {
     public List<HolidayBean> getHolidaysList(HolidayBean bean) {
         Long userId = Long.valueOf(UserUtil.getLoginUser().getUserId());
         bean.setUserId(userId);
-        return dao.getHolidaysList(bean);
+        List<HolidayBean> holidaysList = dao.getHolidaysList(bean);
+        holidaysList.forEach(item -> {
+            if("培训".equals(item.getLeaveType())){
+                item.setIsTrain("1");
+            }else {
+                item.setIsTrain("0");
+            }
+        });
+        return holidaysList;
     }
 
     /**
@@ -207,7 +215,14 @@ public class WeChatServiceImpl implements WeChatService {
      */
     @Override
     public HolidayBean getHolidaysDetail(String uuId) {
-        return dao.getHolidaysDetail(uuId);
+        HolidayBean holidayBean = dao.getHolidaysDetail(uuId);
+        //是否培训
+        if("培训".equals(holidayBean.getLeaveType())){
+            holidayBean.setIsTrain("1");
+        }else {
+            holidayBean.setIsTrain("0");
+        }
+        return holidayBean;
     }
 
     /**
@@ -224,7 +239,11 @@ public class WeChatServiceImpl implements WeChatService {
         o.setSource("3");
         o.setUserId(userId);
         if("临时外出".equals(o.getType())){
-
+            //是否培训
+            if("1".equals(o.getIsTrain())){
+                o.setLeaveType("培训");
+            }
+            o.setType(o.getLeaveType());
         }else{
             o.setLeaveStartInterval("1");
             o.setLeaveEndInterval("2");
diff --git a/src/main/resources/mappers/wechat/WeChatMapper.xml b/src/main/resources/mappers/wechat/WeChatMapper.xml
index a7db6a1..69efd37 100644
--- a/src/main/resources/mappers/wechat/WeChatMapper.xml
+++ b/src/main/resources/mappers/wechat/WeChatMapper.xml
@@ -441,7 +441,16 @@
                         la.examine_status as examineStatus
         FROM leave_apply_wechat la
         WHERE la.is_active = '1'
-          and la.type = #{type}
+        <if test="type != null and type != '' ">
+            <choose>
+                <when test="type == '临时外出'">
+                    and ( locate(#{type},la.type) or locate('培训',la.type) )
+                </when>
+                <otherwise>
+                    and locate(#{type},la.type)
+                </otherwise>
+            </choose>
+        </if>
           and la.user_id = #{userId}
         ORDER BY la.update_time DESC
     </select>