Commit Graph

69 Commits

Author SHA1 Message Date
53bc7551ec 영상관리,라벨링작업 URL Prefix 변경 2026-01-08 14:14:51 +09:00
c8773dabdd 라벨 재할당 로직 수정, 배치로 재배치는 나중에 2026-01-07 14:24:20 +09:00
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
341b1c8f2e 작업현황 수정 2026-01-06 12:02:37 +09:00
Moon
0ae9a55c91 작업현황목록수정 2026-01-05 17:51:23 +09:00
85ad31af34 라벨링 할당,이관 파라미터 형태 변경, userDetail 리턴 항목 추가 2026-01-05 17:17:23 +09:00
239f9ecab6 라벨링작업 관리 > 목록 조회 수정 2026-01-05 17:03:17 +09:00
6e1ad0a944 작업현황 관리 조회 수정 2026-01-05 16:39:32 +09:00
eb47698c2f labelState 조건 수정 2026-01-05 16:31:43 +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
0595f9ad5b projectInfo 조회 추가 2026-01-05 15:54:22 +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
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
8c149605e5 spotless 2026-01-05 13:36:15 +09:00
6d8b3edf7b Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 13:36:15 +09:00
03d8114897 라벨링작업 관리 목록조회 수정 2026-01-05 13:36:07 +09:00
d86e70e27e Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice 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
#	src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java
2026-01-05 13:34:21 +09:00
f5fcc2a9e3 라벨러,검수자 상세 정보, 일자별 목록 쿼리 추가 2026-01-05 13:25:38 +09:00
DanielLee
877de7f17e 주석처리 2026-01-05 12:59:21 +09:00
DanielLee
ba0e408c2b Build Error Fix 2026-01-05 12:45:50 +09:00
DanielLee
910c8754e6 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 12:42:19 +09:00
DanielLee
06d4b597cb 작업현황관리 Data accept fix 2026-01-05 12:42:10 +09:00
Moon
49e4346604 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 12:41:24 +09:00
Moon
040aabe95e 작업현황 DTO수정 2026-01-05 12:41:07 +09:00
DanielLee
96f5a87b1a 작업현황관리 데이터 반환값 추가중 2026-01-05 12:33:48 +09:00
6f089decf9 Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201 2026-01-05 11:46:43 +09:00
b4ae6e148d 라벨할당 검수자 insert 로직 수정 2026-01-05 11:46:21 +09:00
DanielLee
67eb99e243 작업현황관리 수정 2026-01-05 11:41:50 +09:00
88cf9a4487 라벨링작업 관리 목록조회 수정 2026-01-05 10:37:17 +09:00
829cb510e3 spotless 적용 2026-01-05 10:17:24 +09:00
0142da4f72 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 10:05:05 +09:00
5eab38e1ea 학습관리 수정 2026-01-05 10:04:57 +09:00
40daa738f6 라벨할당 로직에 도엽 추가, 라벨러 상세 정보 수정 2026-01-05 09:55:02 +09:00