Commit graph

3139 commits

Author SHA1 Message Date
decb2433de fix script run retire this year 2025-10-03 17:14:20 +07:00
aadcec440e fix sort registry and add script update retire emp / position select 2025-10-03 17:04:05 +07:00
harid
ba9fea8403 no message 2025-10-03 16:57:07 +07:00
39de2a4b34 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
* 'develop' of github.com:Frappet/bma-ehr-organization:
  revert 01/10
2025-10-03 16:45:03 +07:00
53e6d6fb48 fix script retire and fix bug filter registry retire 2025-10-03 16:44:43 +07:00
harid
eb2625ca0b revert 01/10 2025-10-03 16:44:26 +07:00
harid
5259b0beae ทดสอบรันสคริปเกษียณ 03/10 16.30 2025-10-03 16:24:32 +07:00
d113ac6dfe fix error sortBy default 2025-10-03 16:18:48 +07:00
d1ec7b76aa fix sort and add development api 2025-10-03 15:32:55 +07:00
682ff3a061 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
* 'develop' of github.com:Frappet/bma-ehr-organization:
  fix
  sort

# Conflicts:
#	src/controllers/ProfileController.ts
2025-10-03 13:10:29 +07:00
b76895012c fix registry retire 2025-10-03 13:05:24 +07:00
f507bd8677 fix 2025-10-03 10:45:28 +07:00
0ef11abe2b Merge branch 'adiDev' into develop 2025-10-03 10:29:10 +07:00
0172aa9496 sort 2025-10-03 10:28:51 +07:00
4994c829b5 fix query registry retire & sort registry of employee 2025-10-02 18:42:14 +07:00
harid
b5823fdf28 emp 2025-10-02 18:17:19 +07:00
harid
7a25e8feda Fix Error #1815 2025-10-02 17:16:36 +07:00
3ae5e6a233 Merge branch 'develop' into adiDev 2025-10-02 15:19:15 +07:00
342c7dde67 comment เครียร์ตำแหน่งลูกจ้างหลังลบออกจากครองตำแหน่ง 2025-10-02 15:18:48 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b2fafc68e8 add retirement 2025-10-02 14:44:12 +07:00
5efb7346d6 Merge branch 'develop' into adiDev 2025-10-02 14:37:57 +07:00
4be0b068bc #170 and calAge 2025-10-02 14:37:25 +07:00
harid
364e697293 revert 2025-10-02 11:42:01 +07:00
harid
6b719049b0 update script รันเกษียณ #169 2025-10-02 11:40:01 +07:00
harid
7ffb698252 test job เกษียณ 2025-10-01 22:21:16 +07:00
e5dfed9312 fix query 2025-10-01 17:58:36 +07:00
a45d3744e5 Merge branch 'adiDev' into develop 2025-10-01 17:41:50 +07:00
77918a4b6b sort 2025-10-01 17:41:27 +07:00
d8d376386d fix 2025-10-01 16:37:23 +07:00
harid
18aa974c3d update 2025-10-01 16:31:40 +07:00
08af004d4a fix script update retire of 2569 2025-10-01 13:01:54 +07:00
aff6958149 fix error script retire 2025-10-01 12:10:27 +07:00
a366e5ca0d update scrip update retire 2025-10-01 11:33:00 +07:00
mamoss
7eae9d2c8d ลบคนออกจากโครงสร้าง 2025-10-01 08:59:18 +07:00
2a9f69f736 sort 2025-09-30 15:15:57 +07:00
58e44de196 sort org command 2025-09-30 13:52:48 +07:00
77b455ea8f fix 2025-09-30 12:16:48 +07:00
8af006bae3 sort probation 2025-09-30 12:02:44 +07:00
Bright
5be3635198 no message 2025-09-29 17:33:22 +07:00
Bright
e63799eb00 no message 2025-09-29 15:01:01 +07:00
a7ada56745 fix 2025-09-29 14:15:49 +07:00
a8cbf92616 Merge branch 'develop' into adiDev 2025-09-29 13:59:41 +07:00
f2ea301d44 sort แก้ไขทะเบียนประวัติ ตำแหน่ง/เงินเดือน
@Get: api/v1/org/profile/salaryTemp
2025-09-29 13:59:02 +07:00
Bright
3961488b91 #1409 แก้เป็นส่ง refId ของคำสั่งขอลาออกไปค้นที่ command ก่อนอัพ status = CANCEL 2025-09-29 11:46:19 +07:00
mamoss
c5b54d55de api add permission org 2025-09-28 14:24:46 +07:00
mamoss
91281ba995 add-role-staff/user 2025-09-26 23:42:26 +07:00
Bright
191ca586c5 API อัพเดทสถานะ CANCEL คำสั่งยกเลิกการลาออก, คำสั่งยกเลิกการลาออกลูกจ้าง #1409 2025-09-25 18:07:18 +07:00
adisak
f8ba8004b3 fix 2025-09-23 16:22:13 +07:00
adisak
8b40eb0ad5 sort admin 2025-09-23 14:56:38 +07:00
adisak
d999241536 sort admin 2025-09-23 11:54:17 +07:00