Commit Graph

734 Commits

Author SHA1 Message Date
4a5bbd4cf3 라벨 재할당 가능한 대상자 목록 API 2026-01-06 15:31:52 +09:00
DanielLee
89290678e4 이름변경 2026-01-06 14:07:35 +09:00
91ebcc9551 라벨작업관리 목록 API 날짜 수정, 에러로그 날짜 변환 수정 2026-01-06 12:12:35 +09:00
Moon
bb920c6ca8 작업현황 수정 2026-01-06 12:05:27 +09:00
Moon
341b1c8f2e 작업현황 수정 2026-01-06 12:02:37 +09:00
89459b780f 스프링 시큐리티 수정 2026-01-05 19:21:00 +09:00
1af9b87f82 my menus 권한 수정 2026-01-05 18:31:18 +09:00
2cda32e96f 라벨할당 로직 수정 2026-01-05 17:53:06 +09:00
Moon
0ae9a55c91 작업현황목록수정 2026-01-05 17:51:23 +09:00
af87a452a3 spotless 2026-01-05 17:36:53 +09:00
Moon
105d844d4a Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 17:35:30 +09:00
Moon
4839fbc824 영상관리엔티티수정 2026-01-05 17:34:38 +09:00
DanielLee
366262099c UUID 최신순으로 전체 조회 2026-01-05 17:28:19 +09:00
0537f67e93 Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201 2026-01-05 17:17:38 +09:00
85ad31af34 라벨링 할당,이관 파라미터 형태 변경, userDetail 리턴 항목 추가 2026-01-05 17:17:23 +09:00
531108d077 라벨링작업 관리 > 목록 조회 수정 2026-01-05 17:14:03 +09:00
239f9ecab6 라벨링작업 관리 > 목록 조회 수정 2026-01-05 17:03:17 +09:00
6e1ad0a944 작업현황 관리 조회 수정 2026-01-05 16:39:32 +09:00
c30deb5efe spotless 2026-01-05 16:32:57 +09:00
931e43ad43 Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201 2026-01-05 16:31:59 +09:00
eb47698c2f labelState 조건 수정 2026-01-05 16:31:43 +09:00
DanielLee
bd1f82a5d0 Bring Data fix 2026-01-05 16:25:38 +09:00
27d33dac3b 이노펨 mockup api 수정 2026-01-05 16:09:56 +09:00
a86c0b5c4a spotless 2026-01-05 16:08:15 +09:00
Moon
a7464c7ea4 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 16:06:18 +09:00
Moon
c76a0dff1e 라벨상태DTO수정 2026-01-05 16:05:56 +09:00
DanielLee
023ac5be49 name change 2026-01-05 16:00:59 +09:00
DanielLee
4438d20430 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 15:54:37 +09:00
DanielLee
0595f9ad5b projectInfo 조회 추가 2026-01-05 15:54:22 +09:00
a450112b7b Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 15:43:14 +09:00
d8f97c1137 이노펨 mockup api 수정 2026-01-05 15:43:05 +09:00
133b22d299 라벨할당 로직 수정(검수자는 나중에 배치로 업데이트) 2026-01-05 15:41:32 +09:00
0129dcacc5 spotless 2026-01-05 15:19:15 +09:00
Moon
e3aa0abfde Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java
2026-01-05 15:16:59 +09:00
Moon
ed075e47bd 작업현황리스트 수정 2026-01-05 15:16:09 +09:00
067862ff12 라벨링작업 관리 목록조회 수정 2026-01-05 15:01:51 +09:00
7acfd32b49 merge 2026-01-05 14:54:42 +09:00
DanielLee
053d337314 build error fix
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
2026-01-05 14:52:46 +09:00
142685f4c4 Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201 2026-01-05 14:46:48 +09:00
338e9c448c 라벨링작업 관리 목록조회 수정 2026-01-05 14:46:26 +09:00
9e7c73674f Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/label/LabelWorkerApiController.java
#	src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
#	src/main/java/com/kamco/cd/kamcoback/label/service/LabelWorkService.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelWorkCoreService.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryCustom.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java
2026-01-05 14:45:03 +09:00
539831c712 라벨링작업 관리 목록조회 수정 2026-01-05 14:39:08 +09:00
Moon
2db7177edd 작업현황관리 리스트 API분리 2026-01-05 14:22:38 +09:00
0978842400 라벨 이관 로직 수정 2026-01-05 14:13:24 +09:00
3bc801053a merge 할 때 누락된 내용 추가 커밋 2026-01-05 13:54:51 +09:00
a15b319bc2 spotless 2026-01-05 13:45:39 +09:00
DanielLee
78c8cb4a75 build error fix 2026-01-05 13:41:32 +09:00
DanielLee
af8d8c235c Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java
#	src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
2026-01-05 13:37:44 +09:00
DanielLee
462cdc0241 worklist delete 2026-01-05 13:37:30 +09:00
6d2d21b221 Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201 2026-01-05 13:36:36 +09:00