leavecommandno add year

This commit is contained in:
mamoss 2025-03-26 10:58:03 +07:00
parent a34a048dee
commit 4b1fabad44

View file

@ -2955,7 +2955,7 @@ export class CommandController extends Controller {
}
}
profile.leaveCommandId = item.commandId ?? _null;
profile.leaveCommandNo = item.commandNo ?? _null;
profile.leaveCommandNo = `${item.commandNo}${item.commandYear}`;
profile.leaveRemark = clearProfile.leaveRemark ?? _null;
profile.leaveDate = item.commandDateAffect ?? _null;
profile.leaveType = clearProfile.LeaveType ?? _null;
@ -3120,7 +3120,7 @@ export class CommandController extends Controller {
}
}
profile.leaveCommandId = item.commandId ?? _null;
profile.leaveCommandNo = item.commandNo ?? _null;
profile.leaveCommandNo = `${item.commandNo}${item.commandYear}`;
profile.leaveRemark = clearProfile.leaveRemark ?? _null;
profile.leaveDate = item.commandDateAffect ?? _null;
profile.leaveType = clearProfile.LeaveType ?? _null;
@ -3586,7 +3586,7 @@ export class CommandController extends Controller {
if (exceptClear.status) {
_profile.leaveReason = item.leaveReason ?? _null;
_profile.leaveCommandId = item.commandId ?? _null;
_profile.leaveCommandNo = item.commandNo ?? _null;
_profile.leaveCommandNo = `${item.commandNo}${item.commandYear}`;
_profile.leaveRemark = exceptClear.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = exceptClear.LeaveType ?? _null;
@ -3605,7 +3605,7 @@ export class CommandController extends Controller {
}
}
_profile.leaveCommandId = item.commandId ?? _null;
_profile.leaveCommandNo = item.commandNo ?? _null;
_profile.leaveCommandNo = `${item.commandNo}${item.commandYear}`;
_profile.leaveRemark = clearProfile.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = clearProfile.LeaveType ?? _null;
@ -3782,7 +3782,7 @@ export class CommandController extends Controller {
if (exceptClear.status) {
_profile.leaveReason = item.leaveReason ?? _null;
_profile.leaveCommandId = item.commandId ?? _null;
_profile.leaveCommandNo = item.commandNo ?? _null;
_profile.leaveCommandNo = `${item.commandNo}${item.commandYear}`;
_profile.leaveRemark = exceptClear.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = exceptClear.LeaveType ?? _null;
@ -3801,7 +3801,7 @@ export class CommandController extends Controller {
}
}
_profile.leaveCommandId = item.commandId ?? _null;
_profile.leaveCommandNo = item.commandNo ?? _null;
_profile.leaveCommandNo = `${item.commandNo}${item.commandYear}`;
_profile.leaveRemark = clearProfile.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = clearProfile.LeaveType ?? _null;
@ -4014,7 +4014,7 @@ export class CommandController extends Controller {
if (exceptClear.status) {
_profile.leaveReason = item.leaveReason ?? _null;
_profile.leaveCommandId = item.commandId ?? _null;
_profile.leaveCommandNo = item.commandNo ?? _null;
_profile.leaveCommandNo = `${item.commandNo}${item.commandYear}`;
_profile.leaveRemark = exceptClear.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = exceptClear.LeaveType ?? _null;
@ -4033,7 +4033,7 @@ export class CommandController extends Controller {
}
}
_profile.leaveCommandId = item.commandId ?? _null;
_profile.leaveCommandNo = item.commandNo ?? _null;
_profile.leaveCommandNo = `${item.commandNo}${item.commandYear}`;
_profile.leaveRemark = clearProfile.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = clearProfile.LeaveType ?? _null;
@ -4372,7 +4372,7 @@ export class CommandController extends Controller {
}
}
_profile.leaveCommandId = item.commandId ?? _null;
_profile.leaveCommandNo = item.commandNo ?? _null;
_profile.leaveCommandNo = `${item.commandNo}${item.commandYear}`;
_profile.leaveRemark = clearProfile.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = clearProfile.LeaveType ?? _null;