hrms-api-org

hrms-bangkok/hrms-api-org

Fork 0

Commit graph

59cefbeec5 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop Kittapath 2024-05-27 16:50:20 +07:00
9d81bdb470 no message Kittapath 2024-05-27 16:48:50 +07:00
abc4aee8a4 api api/v1/org/profile/leave/search AdisakKanthawilang 2024-05-27 16:30:14 +07:00
7126d64d7e add api history/user AdisakKanthawilang 2024-05-27 15:17:27 +07:00
3438b450ba Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-27 11:38:11 +07:00
3167fe271e API checkRole and history/user AdisakKanthawilang 2024-05-27 11:36:55 +07:00
c2f71acad9 เพิ่มเหตุผลเกษียณ Kittapath 2024-05-27 08:58:44 +07:00
38871bcc80 Merge branch 'adiDev' into develop AdisakKanthawilang 2024-05-24 18:08:17 +07:00
eb85bdcb45 fix and add profile by key cloak AdisakKanthawilang 2024-05-24 18:06:54 +07:00
0f846df20e fix kk1employee AnandaTon 2024-05-24 16:48:33 +07:00
ee030a0e2d เพิ่ม report kk1 employee AnandaTon 2024-05-24 15:57:29 +07:00
a242f7bbdd เพิ่ม report kk1 AnandaTon 2024-05-24 13:42:59 +07:00
7b480b1247 api history/user AdisakKanthawilang 2024-05-24 13:13:52 +07:00
63d357ea30 Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-24 11:09:26 +07:00
eea123fbad add field profile and profile-employee search-personal AdisakKanthawilang 2024-05-24 11:06:43 +07:00
85f8fbb03a get profile by token Kittapath 2024-05-24 01:11:47 +07:00
58fe2f08fd get ข้อมูล by keycloak (ลูกจ้าง) Bright 2024-05-23 18:30:16 +07:00
24c5cbef55 แก้ค้นหาประวัติ by token Kittapath 2024-05-23 17:20:15 +07:00
ff0be7af48 get ข้อมูล by keycloak Kittapath 2024-05-23 16:44:37 +07:00
f6bcd35e14 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop Kittapath 2024-05-23 15:38:18 +07:00
852525c8f5 แก้ค้นหาลูกจ้าง Kittapath 2024-05-23 15:37:13 +07:00
86fd868adf ปรับ query report Bright 2024-05-23 15:28:49 +07:00
689d48aadc no message Kittapath 2024-05-23 14:10:50 +07:00
bda7c1328f Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-23 10:28:58 +07:00
2c64ee1220 fix AdisakKanthawilang 2024-05-23 10:26:43 +07:00
f75c6237aa Merge branch 'develop' into develop-Bright Bright 2024-05-23 10:11:23 +07:00
2149b799dc report ประวัติแบบย่อ Bright 2024-05-23 10:08:41 +07:00
bbd8c1c0e9 report ประวัติแบบย่อ Bright 2024-05-23 10:08:41 +07:00
732467965e Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-23 10:07:50 +07:00
cd050b2032 fix sort AdisakKanthawilang 2024-05-23 10:07:07 +07:00
8c03528ff3 profile/search เพิ่ม profileId Kittapath 2024-05-21 15:00:55 +07:00
c56ffece73 fix AdisakKanthawilang 2024-05-21 13:55:26 +07:00
40d2a37b34 fix AdisakKanthawilang 2024-05-21 13:30:25 +07:00
3b68f7670f api profile/search AdisakKanthawilang 2024-05-21 13:23:42 +07:00
f6bdfce063 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop Kittapath 2024-05-20 15:27:56 +07:00
7763544a93 no message Kittapath 2024-05-20 15:25:18 +07:00
77e3248a3a ค้นหาประวัติการครองตำแหน่ง ขรก./ลูกจ้าง Bright 2024-05-20 15:23:26 +07:00
8f74e3a366 Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-20 11:13:18 +07:00
d052f67454 fix edu AdisakKanthawilang 2024-05-20 11:12:23 +07:00
1961c05172 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop Kittapath 2024-05-17 17:16:35 +07:00
2cfef7abd6 get profile by keycloak Kittapath 2024-05-17 17:14:41 +07:00
9b85f0d021 แก้ไข return null เมื่อวันที่ไม่สอดคล้อง AnandaTon 2024-05-17 15:34:21 +07:00
71cbecdce0 migrate Kittapath 2024-05-17 14:24:20 +07:00
391501b665 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop AnandaTon 2024-05-17 14:22:05 +07:00
ae947a48c0 เพิ่มฟิว governant AnandaTon 2024-05-17 14:21:53 +07:00
92a865fd3c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop Kittapath 2024-05-17 14:17:09 +07:00
2869430083 no message Kittapath 2024-05-17 14:16:40 +07:00
884fe694d0 Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-17 13:36:27 +07:00
25285af736 add dateRetireLaw profile AdisakKanthawilang 2024-05-17 13:35:36 +07:00
a529207692 เช็คเลขบัตร ปชช. Bright 2024-05-17 12:54:18 +07:00
68394fe07c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop Kittapath 2024-05-17 11:27:49 +07:00
77e0cee23e migrate Kittapath 2024-05-17 11:27:28 +07:00
eb50563dfe Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-17 11:23:23 +07:00
9045b9ec90 fix AdisakKanthawilang 2024-05-17 11:22:31 +07:00
c306c85504 ค้นหาตำแหน่งในระบบสมัครสอบ ลูกจ้าง Bright 2024-05-17 11:16:39 +07:00
5361184bfd Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-17 11:09:49 +07:00
b456b5ca72 fix AdisakKanthawilang 2024-05-17 11:09:04 +07:00
06db1a6c68 fix swap direction AnandaTon 2024-05-17 11:03:27 +07:00
0f217da42c Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop AnandaTon 2024-05-17 10:11:40 +07:00
fdb5844ad8 แก้ไข patch salary employee AnandaTon 2024-05-17 10:11:30 +07:00
5254eaa9c9 migrate Kittapath 2024-05-17 10:00:21 +07:00
243b5d3f4f Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-17 09:51:02 +07:00
91b177190c add nationality AdisakKanthawilang 2024-05-17 09:50:19 +07:00
ef62099e92 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop AnandaTon 2024-05-17 09:43:58 +07:00
6f74d3ddcc แก้ไขบัค employeeSalary AnandaTon 2024-05-17 09:42:49 +07:00
056f40ab4c migrate Kittapath 2024-05-17 09:41:02 +07:00
067231d291 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop Kittapath 2024-05-17 09:32:23 +07:00
6525bbcb6f no message Kittapath 2024-05-17 09:32:07 +07:00
61a68fdb19 เพิ่มฟิลด์ coupleCitizenId Bright 2024-05-16 17:11:44 +07:00
c03fa76295 ตัดฟิลด์ couple Bright 2024-05-16 16:06:11 +07:00
a39c33ae0d Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-16 15:24:08 +07:00
4dac692284 fix AdisakKanthawilang 2024-05-16 15:22:30 +07:00
d26337caf3 แก้ชื่อ function AnandaTon 2024-05-16 15:16:00 +07:00
3b5096c005 fix SalaryEmployee ลบไฟล์ รวมไฟล์ เพิ่ม field AnandaTon 2024-05-16 15:03:29 +07:00
42bad7b302 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop AnandaTon 2024-05-16 14:11:18 +07:00
9603f895ad Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop AnandaTon 2024-05-16 14:10:20 +07:00
fe6b5b5b04 Update ProfileDisciplineController.ts AnandaTon 2024-05-16 14:10:17 +07:00
4676b62a6f no message Kittapath 2024-05-16 14:10:08 +07:00
feb8da3947 เพิ่มsearch avatar Kittapath 2024-05-16 13:39:25 +07:00
62166c430e no message Kittapath 2024-05-16 12:23:37 +07:00
61899e8431 no message Kittapath 2024-05-16 12:18:51 +07:00
3ea5ec3486 อัพรูป Kittapath 2024-05-16 12:13:46 +07:00
6010cc662c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop Kittapath 2024-05-16 11:43:38 +07:00
17d9958882 no message Kittapath 2024-05-16 11:41:26 +07:00
701ab5af6e แก้ไขบัคปรับ salary AnandaTon 2024-05-16 11:36:17 +07:00
3e62126570 ปรับ family Bright 2024-05-16 11:12:17 +07:00
0524653f4b แก้รูปเก่า false Kittapath 2024-05-16 10:54:13 +07:00
4a80b30c5b no message Kittapath 2024-05-16 10:39:49 +07:00
0bbd172f2b Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-16 10:33:42 +07:00
ffb5b38936 empAddress and fix durationYear AdisakKanthawilang 2024-05-16 10:32:51 +07:00
9317c3348b no message Kittapath 2024-05-16 10:04:41 +07:00
73c91bd9b1 update_table_ProfileAvatar_add_isactive Kittapath 2024-05-16 10:01:59 +07:00
9d240969a3 migrate Kittapath 2024-05-16 09:37:43 +07:00
b510ae62aa แก้โค้ด AnandaTon 2024-05-16 09:35:11 +07:00
da4eb54a59 migrate Kittapath 2024-05-16 09:16:09 +07:00
9f2357b81c Merge branch 'develop' into adiDev AdisakKanthawilang 2024-05-15 18:07:12 +07:00
cf3c3feba2 fix entity and store dateRetire AdisakKanthawilang 2024-05-15 18:06:28 +07:00
4fa11d2aea ปรับ children Bright 2024-05-15 18:02:16 +07:00
1a017dcd76 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop Kittapath 2024-05-15 16:09:42 +07:00
277805791d no message Kittapath 2024-05-15 16:09:25 +07:00