Commit Graph

374 Commits

Author SHA1 Message Date
47ab483d42 json 형식 2026-01-05 17:00:35 +09:00
f1841b0107 Merge branch 'develop' of https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice into feat/dean/test-scene 2026-01-05 16:50:12 +09:00
a7c0eb9fad Merge pull request '작업현황 관리 조회 수정' (#145) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/145
2026-01-05 16:39:58 +09:00
6e1ad0a944 작업현황 관리 조회 수정 2026-01-05 16:39:32 +09:00
6471314b17 Merge pull request 'feat/dev_251201' (#144) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/144
2026-01-05 16:33:30 +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
d8da066d59 Merge pull request 'feat/dev_251201' (#143) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/143
2026-01-05 16:09:03 +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
a03fcad671 Merge pull request '라벨할당 로직 수정(검수자는 나중에 배치로 업데이트)' (#142) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/142
2026-01-05 15:42:17 +09:00
133b22d299 라벨할당 로직 수정(검수자는 나중에 배치로 업데이트) 2026-01-05 15:41:32 +09:00
a74416cfdf Merge pull request 'feat/dev_251201' (#141) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/141
2026-01-05 15:20:04 +09:00
0129dcacc5 spotless 2026-01-05 15:19:15 +09:00
Moon
ed075e47bd 작업현황리스트 수정 2026-01-05 15:16:09 +09:00
74025fb729 Merge pull request 'feat/dev_251201' (#140) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/140
2026-01-05 15:04:10 +09:00
067862ff12 라벨링작업 관리 목록조회 수정 2026-01-05 15:01:51 +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
375609c451 Merge pull request '라벨 이관 로직 수정' (#139) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/139
2026-01-05 14:14:10 +09:00
0978842400 라벨 이관 로직 수정 2026-01-05 14:13:24 +09:00
08002cd265 Merge pull request 'feat/dev_251201' (#137) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/137
2026-01-05 13:46:18 +09:00
DanielLee
78c8cb4a75 build error fix 2026-01-05 13:41:32 +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
06d4b597cb 작업현황관리 Data accept fix 2026-01-05 12:42:10 +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
a4471b186f Merge pull request '학습관리 수정' (#136) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/136
2026-01-05 10:18:47 +09:00
6a77d0f447 spotless 적용 2026-01-05 10:17:52 +09:00
829cb510e3 spotless 적용 2026-01-05 10:17:24 +09:00
4cea4bb2ed 학습관리 수정 2026-01-05 10:17:01 +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
3a491e3f14 Merge pull request 'feat/dev_251201' (#133) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/133
2026-01-02 22:18:33 +09:00
dc2b9286f4 spotless 2026-01-02 22:18:09 +09:00
a7b04d0be8 파라미터 yyyy기준으로 변경 2026-01-02 22:17:42 +09:00