成都获取假期余额调整

mjava-kaiyue/src/main/java/com/malk/kaiyue/service/impl/KYCDServiceImpl.java

@@ -60,7 +60,10 @@ public class KYCDServiceImpl extends ServiceImpl<AdvancedLeaveMapper, AdvancedLe
 //    private static final String LEAVE_CODE = "609a84ed-54d4-4ecd-a44f-4c55b04c37ea";
 
     //成都凯越-年假
-    private static final String LEAVE_CODE = "f7e0de92-806f-457e-9aa1-c20b245d741e";
+//    private static final String LEAVE_CODE = "f7e0de92-806f-457e-9aa1-c20b245d741e";
+
+    //成都凯悦-年假2026
+    private static final String LEAVE_CODE = "dd2db7b8-a013-4b1b-ac01-ee643242c2fd";
 
 
     //体验社-成都年假测试
@@ -488,7 +491,7 @@ public class KYCDServiceImpl extends ServiceImpl<AdvancedLeaveMapper, AdvancedLe
 
         //查询员工年假余额
         List<Map> leaveQuotasList = new ArrayList<>();
-        getLeaveNum("f7e0de92-806f-457e-9aa1-c20b245d741e",userId,0,50,leaveQuotasList);
+        getLeaveNum(LEAVE_CODE,userId,0,50,leaveQuotasList);
 
         if (Objects.nonNull(leaveQuotasList)){
             for (Map leaveQuotas : leaveQuotasList) {
@@ -511,8 +514,8 @@ public class KYCDServiceImpl extends ServiceImpl<AdvancedLeaveMapper, AdvancedLe
         }else {
             BigDecimal relYearLeave = annualLeaveNum.remainder(new BigDecimal(0.5));
             leaveMap.put("可预支年假",annualLeaveNum.subtract(relYearLeave));
-            leaveMap.put("实际年假余额",annualLeaveNum.subtract(new BigDecimal(8)));
-            leaveMap.put("已预支年假",new BigDecimal(8).subtract(annualLeaveNum).add(relYearLeave));
+            leaveMap.put("实际年假余额",relYearLeave);
+            leaveMap.put("已预支年假",new BigDecimal(8).subtract(annualLeaveNum.subtract(relYearLeave)));
         }
 
         //获取员工调休假余额