MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/infer_dev_260107' into feat/infer_dev_260107

Browse Source
This commit is contained in:
DanielLee
2026-01-14 11:57:58 +09:00
parent 767bea7da5 dab6be68f8
commit 19797c2171
3 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java
View File

@@ -259,32 +259,32 @@ public class LabelAllocateApiController {
name = "라벨링 종료", name = "라벨링 종료",
value = value =
""" """
{"closedType": "LABELING", "closedYn": "Y"} {"closedType": "LABELING", "closedYn": "Y"}
"""), """),
@io.swagger.v3.oas.annotations.media.ExampleObject( @io.swagger.v3.oas.annotations.media.ExampleObject(
name = "검수 종료", name = "검수 종료",
value = value =
""" """
{"closedType": "INSPECTION", "closedYn": "Y"} {"closedType": "INSPECTION", "closedYn": "Y"}
"""), """),
@io.swagger.v3.oas.annotations.media.ExampleObject( @io.swagger.v3.oas.annotations.media.ExampleObject(
name = "라벨링 재개", name = "라벨링 재개",
value = value =
""" """
{"closedType": "LABELING", "closedYn": "N"} {"closedType": "LABELING", "closedYn": "N"}
"""), """),
@io.swagger.v3.oas.annotations.media.ExampleObject( @io.swagger.v3.oas.annotations.media.ExampleObject(
name = "검수 재개", name = "검수 재개",
value = value =
""" """
{"closedType": "INSPECTION", "closedYn": "N"} {"closedType": "INSPECTION", "closedYn": "N"}
"""), """),
@io.swagger.v3.oas.annotations.media.ExampleObject( @io.swagger.v3.oas.annotations.media.ExampleObject(
name = "특정 프로젝트 라벨링 종료", name = "특정 프로젝트 라벨링 전체 종료",
value = value =
""" """
{"uuid": "f97dc186-e6d3-4645-9737-3173dde8dc64", "closedType": "LABELING", "closedYn": "Y"} {"uuid": "f97dc186-e6d3-4645-9737-3173dde8dc64", "closedType": "INSPECTION", "closedYn": "Y"}
""") """)
})) }))
@RequestBody @RequestBody
@Valid @Valid

4
src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java
View File

@@ -58,6 +58,10 @@ public class LabelWorkDto {
private String labelingClosedYn; private String labelingClosedYn;
private String inspectionClosedYn; private String inspectionClosedYn;
private Long inspectorCompleteTotCnt;
private Long inspectorRemainCnt;
private ZonedDateTime projectCloseDttm;
@JsonProperty("detectYear") @JsonProperty("detectYear")
public String getDetectYear() { public String getDetectYear() {
if (compareYyyy == null || targetYyyy == null) { if (compareYyyy == null || targetYyyy == null) {

21
src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java
View File

@@ -1,5 +1,6 @@
package com.kamco.cd.kamcoback.postgres.repository.label; package com.kamco.cd.kamcoback.postgres.repository.label;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto; import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng; import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
@@ -204,7 +205,25 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
// totalAssignmentCnt: 총 배정 건수 (서브쿼리) // totalAssignmentCnt: 총 배정 건수 (서브쿼리)
totalAssignmentCntSubQuery, totalAssignmentCntSubQuery,
mapSheetAnalInferenceEntity.labelingClosedYn, mapSheetAnalInferenceEntity.labelingClosedYn,
mapSheetAnalInferenceEntity.inspectionClosedYn)) mapSheetAnalInferenceEntity.inspectionClosedYn,
new CaseBuilder()
.when(
mapSheetAnalDataInferenceGeomEntity.testState.eq(
InspectState.COMPLETE.getId()))
.then(1L)
.otherwise(0L)
.sum(),
new CaseBuilder()
.when(
mapSheetAnalDataInferenceGeomEntity.testState.eq(
InspectState.UNCONFIRM.getId()))
.then(1L)
.otherwise(0L)
.sum(),
new CaseBuilder()
.when(mapSheetAnalInferenceEntity.inspectionClosedYn.eq("Y"))
.then(mapSheetAnalInferenceEntity.updatedDttm)
.otherwise((ZonedDateTime) null)))
.from(mapSheetAnalInferenceEntity) .from(mapSheetAnalInferenceEntity)
.innerJoin(mapSheetAnalDataInferenceEntity) .innerJoin(mapSheetAnalDataInferenceEntity)
.on(whereSubDataBuilder) .on(whereSubDataBuilder)