diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java index 722a17dc..25ce7d9b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java @@ -184,11 +184,14 @@ public class MapSheetMngDto { } public long getSyncErrorTotCnt() { - return this.syncNotPaireCnt + this.syncDuplicateCnt + this.syncFaultCnt; + return this.syncNotPaireCnt + this.syncDuplicateCnt + this.syncFaultCnt + this.syncNoFileCnt; } public long getSyncErrorExecTotCnt() { - return this.syncNotPaireExecCnt + this.syncDuplicateExecCnt + this.syncFaultExecCnt; + return this.syncNotPaireExecCnt + + this.syncDuplicateExecCnt + + this.syncFaultExecCnt + + this.syncNoFileExecCnt; } public String getMngState() { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java index 5b6abb1a..a2dba0a8 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java @@ -207,7 +207,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport .on(mapSheetMngEntity.mngYyyy.eq(mapSheetMngHstEntity.mngYyyy)) .leftJoin(mapInkx5kEntity) .on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo)) - .where(whereBuilder) + .where(mapInkx5kEntity.useInference.eq(CommonUseStatus.USE)) // .offset(pageable.getOffset()) // .limit(pageable.getPageSize()) .orderBy(mapSheetMngEntity.mngYyyy.desc()) @@ -254,7 +254,9 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport public MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy) { BooleanBuilder whereBuilder = new BooleanBuilder(); - whereBuilder.and(mapSheetMngEntity.mngYyyy.eq(mngYyyy)); + whereBuilder + .and(mapSheetMngEntity.mngYyyy.eq(mngYyyy)) + .and(mapInkx5kEntity.useInference.eq(CommonUseStatus.USE)); MapSheetMngDto.MngDto foundContent = queryFactory