From e6553dcab4a22fe5806799ef3774bc2dd120a38c Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 15 Jul 2024 11:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4-=E6=89=B9=E9=87=8F=E8=AF=B7?=
 =?UTF-8?q?=E5=81=87=EF=BC=8C=E5=90=8C=E4=B8=80=E5=81=87=E6=9C=9F=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E5=A4=9A=E6=9D=A1=E5=81=87=E6=9C=9F=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8B=BC=E6=8E=A5=E6=97=B6=E9=95=BF=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=80=BB=E6=97=B6=E9=95=BF=E7=BB=9F=E8=AE=A1=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/service/impl/AskForLeaveServiceImpl.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java b/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java
index fcdf7ad..9fc9bf9 100644
--- a/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java
+++ b/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java
@@ -662,6 +662,8 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic
                 detailData.put("qjlx", itemId);
                 detailData.put("qjlxName", itemName);
                 String jqyeId = Util.null2String(detailData.get("jqye"));
+                //已分配的请假时长
+                String matchedQjsc = Util.null2String(detailData.get("qjsc"));
                 if (leaveDuration > wxsc) {
                     detailData.put("qjsc", String.valueOf(wxsc));
                     leaveDuration = Utils.subtract(leaveDuration, wxsc);
@@ -671,6 +673,7 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic
                     } else {
                         //同一假期类型，当一条假期余额记录不足请假时长需求时，需要拼接上另一条假期余额记录的id
                         detailData.put("jqye", jqyeId + "," + holidayBalance.get("id").toString() + "_" + wxsc);
+                        detailData.put("qjsc", String.valueOf(Utils.add(wxsc, Double.parseDouble(matchedQjsc))));
                     }
                     wxsc = 0;
                 } else {
@@ -684,6 +687,7 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic
                     } else {
                         //同一假期类型，当一条假期余额记录不足请假时长需求时，需要拼接上另一条假期余额记录的id
                         detailData.put("jqye", jqyeId + "," + holidayBalance.get("id").toString() + "_" + leaveDuration);
+                        detailData.put("qjsc", String.valueOf(Utils.add(leaveDuration, Double.parseDouble(matchedQjsc))));
                     }
                     leaveDuration = 0;
                     result.add(detailData);