From 12fcaaf359a0ae70e5a1829eeee07c8dea560ed6 Mon Sep 17 00:00:00 2001 From: Moon Date: Tue, 23 Dec 2025 15:50:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=97=85=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapsheet/MapSheetMngRepositoryImpl.java | 58 +++++++++++-------- 1 file changed, 34 insertions(+), 24 deletions(-) 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 6c1fbcd2..3aacb6d8 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 @@ -422,30 +422,40 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport queryFactory .select( Projections.constructor( - MapSheetMngDto.ErrorDataDto.class, - mapSheetMngHstEntity.hstUid, - mapSheetMngHstEntity.mngYyyy, - mapSheetMngHstEntity.mapSheetNum, - mapSheetMngHstEntity.refMapSheetNum, - Expressions.stringTemplate( - "concat({0},substring({1}, 0, 6))", - mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) - .as("map50kName"), - Expressions.stringTemplate( - "({0},{1})", mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) - .as("map5kName"), - Expressions.stringTemplate( - "concat({0},substring({1}, 6, 8))", - mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) - .as("mapSrcName"), - mapInkx5kEntity.fid, - mapSheetMngHstEntity.createdDate, - mapSheetMngHstEntity.syncState, - mapSheetMngHstEntity.syncTfwFileName, - mapSheetMngHstEntity.syncTifFileName, - mapSheetMngHstEntity.syncCheckState, - mapSheetMngHstEntity.syncCheckTfwFileName, - mapSheetMngHstEntity.syncCheckTifFileName)) + MapSheetMngDto.ErrorDataDto.class, + mapSheetMngHstEntity.hstUid, + mapSheetMngHstEntity.mngYyyy, + mapSheetMngHstEntity.mapSheetNum, + mapSheetMngHstEntity.refMapSheetNum, + + Expressions.stringTemplate( + "concat({0}, substring({1}, 1, 5))", + mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum + ), + + // ✅ 튜플 방지: concat으로 문자열 생성 + Expressions.stringTemplate( + "concat('(', {0}, ',', {1}, ')')", + mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum + ), + + Expressions.stringTemplate( + "concat({0}, substring({1}, 6, 3))", + mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum + ), + + // fid 타입 주의 (Long이면 DTO도 Long으로 맞추는 걸 추천) + mapInkx5kEntity.fid, // 또는 mapInkx5kEntity.fid.intValue() + + // ✅ createdDate 말고 ZonedDateTime으로 매핑된 필드로 + mapSheetMngHstEntity.createdDate, // (예시) + + mapSheetMngHstEntity.syncState, + mapSheetMngHstEntity.syncTfwFileName, + mapSheetMngHstEntity.syncTifFileName, + mapSheetMngHstEntity.syncCheckState, + mapSheetMngHstEntity.syncCheckTfwFileName, + mapSheetMngHstEntity.syncCheckTifFileName)) .from(mapSheetMngHstEntity) .innerJoin(mapInkx5kEntity) .on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo)) From c7093736d81c93ba0f0976448dc3d2777d83fe19 Mon Sep 17 00:00:00 2001 From: teddy Date: Tue, 23 Dec 2025 15:51:51 +0900 Subject: [PATCH 2/2] =?UTF-8?q?spot=20less=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapsheet/MapSheetMngRepositoryImpl.java | 56 +++++++++---------- 1 file changed, 25 insertions(+), 31 deletions(-) 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 757a1999..add560c9 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 @@ -399,40 +399,34 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport queryFactory .select( Projections.constructor( - MapSheetMngDto.ErrorDataDto.class, - mapSheetMngHstEntity.hstUid, - mapSheetMngHstEntity.mngYyyy, - mapSheetMngHstEntity.mapSheetNum, - mapSheetMngHstEntity.refMapSheetNum, + MapSheetMngDto.ErrorDataDto.class, + mapSheetMngHstEntity.hstUid, + mapSheetMngHstEntity.mngYyyy, + mapSheetMngHstEntity.mapSheetNum, + mapSheetMngHstEntity.refMapSheetNum, + Expressions.stringTemplate( + "concat({0}, substring({1}, 1, 5))", + mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum), - Expressions.stringTemplate( - "concat({0}, substring({1}, 1, 5))", - mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum - ), + // ✅ 튜플 방지: concat으로 문자열 생성 + Expressions.stringTemplate( + "concat('(', {0}, ',', {1}, ')')", + mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum), + Expressions.stringTemplate( + "concat({0}, substring({1}, 6, 3))", + mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum), - // ✅ 튜플 방지: concat으로 문자열 생성 - Expressions.stringTemplate( - "concat('(', {0}, ',', {1}, ')')", - mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum - ), + // fid 타입 주의 (Long이면 DTO도 Long으로 맞추는 걸 추천) + mapInkx5kEntity.fid, // 또는 mapInkx5kEntity.fid.intValue() - Expressions.stringTemplate( - "concat({0}, substring({1}, 6, 3))", - mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum - ), - - // fid 타입 주의 (Long이면 DTO도 Long으로 맞추는 걸 추천) - mapInkx5kEntity.fid, // 또는 mapInkx5kEntity.fid.intValue() - - // ✅ createdDate 말고 ZonedDateTime으로 매핑된 필드로 - mapSheetMngHstEntity.createdDate, // (예시) - - mapSheetMngHstEntity.syncState, - mapSheetMngHstEntity.syncTfwFileName, - mapSheetMngHstEntity.syncTifFileName, - mapSheetMngHstEntity.syncCheckState, - mapSheetMngHstEntity.syncCheckTfwFileName, - mapSheetMngHstEntity.syncCheckTifFileName)) + // ✅ createdDate 말고 ZonedDateTime으로 매핑된 필드로 + mapSheetMngHstEntity.createdDate, // (예시) + mapSheetMngHstEntity.syncState, + mapSheetMngHstEntity.syncTfwFileName, + mapSheetMngHstEntity.syncTifFileName, + mapSheetMngHstEntity.syncCheckState, + mapSheetMngHstEntity.syncCheckTfwFileName, + mapSheetMngHstEntity.syncCheckTifFileName)) .from(mapSheetMngHstEntity) .innerJoin(mapInkx5kEntity) .on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo))