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

spotless

Browse Source
This commit is contained in:
Gina(박가연)
2026-01-08 18:31:38 +09:00
parent 1e505e2ece
commit 1a85c99ae4
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,9 +64,7 @@ public class LabelWorkDto {
return compareYyyy + "-" + targetYyyy; return compareYyyy + "-" + targetYyyy;
} }
/** /** 라벨링 상태 반환 (tb_map_sheet_anal_inference.anal_state 기준) */
* 라벨링 상태 반환 (tb_map_sheet_anal_inference.anal_state 기준)
*/
public String getLabelState() { public String getLabelState() {
// anal_state 값이 있으면 해당 값 사용 // anal_state 값이 있으면 해당 값 사용
if (this.analState != null && !this.analState.isEmpty()) { if (this.analState != null && !this.analState.isEmpty()) {
@@ -104,8 +102,8 @@ public class LabelWorkDto {
} }
/** /**
* 작업 진행률 반환 (tb_labeling_assignment.stagnation_yn = 'N'인 정상 진행율 기준) * 작업 진행률 반환 (tb_labeling_assignment.stagnation_yn = 'N'인 정상 진행율 기준) 계산식: (정상 진행 건수 / 총 배정 건수) *
* 계산식: (정상 진행 건수 / 총 배정 건수) * 100 * 100
*/ */
public double getLabelRate() { public double getLabelRate() {
if (this.totalAssignmentCnt == null || this.totalAssignmentCnt == 0) { if (this.totalAssignmentCnt == null || this.totalAssignmentCnt == 0) {

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

@@ -11,7 +11,6 @@ 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;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail; import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerState; import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerState;
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceGeomEntity;
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalInferenceEntity; import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalInferenceEntity;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Expression; import com.querydsl.core.types.Expression;
@@ -49,7 +48,6 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
private final JPAQueryFactory queryFactory; private final JPAQueryFactory queryFactory;
private final StringExpression NULL_STRING = Expressions.stringTemplate("cast(null as text)"); private final StringExpression NULL_STRING = Expressions.stringTemplate("cast(null as text)");
/** /**
* 변화탐지 년도 셀렉트박스 조회 * 변화탐지 년도 셀렉트박스 조회
* *
@@ -123,14 +121,17 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
} }
// labelTotCnt: pnu가 있고 pass_yn = false (부적합)인 건수만 라벨링 대상 // labelTotCnt: pnu가 있고 pass_yn = false (부적합)인 건수만 라벨링 대상
NumberExpression<Long> labelTotCntExpr = new CaseBuilder() NumberExpression<Long> labelTotCntExpr =
.when( new CaseBuilder()
mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull() .when(
.and(mapSheetAnalDataInferenceGeomEntity.pnu.ne(0L)) mapSheetAnalDataInferenceGeomEntity
.and(mapSheetAnalDataInferenceGeomEntity.passYn.eq(Boolean.FALSE))) .pnu
.then(1L) .isNotNull()
.otherwise(0L) .and(mapSheetAnalDataInferenceGeomEntity.pnu.ne(0L))
.sum(); .and(mapSheetAnalDataInferenceGeomEntity.passYn.eq(Boolean.FALSE)))
.then(1L)
.otherwise(0L)
.sum();
// stagnation_yn = 'N'인 정상 진행 건수 (서브쿼리로 별도 집계) // stagnation_yn = 'N'인 정상 진행 건수 (서브쿼리로 별도 집계)
Expression<Long> normalProgressCntSubQuery = Expression<Long> normalProgressCntSubQuery =