|
|
|
@ -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);
|
|
|
|
|