Merge pull request 'feat/dev_251201' (#101) from feat/dev_251201 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/101
This commit is contained in:
2025-12-23 15:52:17 +09:00

View File

@@ -405,18 +405,22 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
mapSheetMngHstEntity.mapSheetNum, mapSheetMngHstEntity.mapSheetNum,
mapSheetMngHstEntity.refMapSheetNum, mapSheetMngHstEntity.refMapSheetNum,
Expressions.stringTemplate( Expressions.stringTemplate(
"concat({0},substring({1}, 0, 6))", "concat({0}, substring({1}, 1, 5))",
mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum),
.as("map50kName"),
// ✅ 튜플 방지: concat으로 문자열 생성
Expressions.stringTemplate( Expressions.stringTemplate(
"({0},{1})", mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) "concat('(', {0}, ',', {1}, ')')",
.as("map5kName"), mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum),
Expressions.stringTemplate( Expressions.stringTemplate(
"concat({0},substring({1}, 6, 8))", "concat({0}, substring({1}, 6, 3))",
mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum),
.as("mapSrcName"),
mapInkx5kEntity.fid, // fid 타입 주의 (Long이면 DTO도 Long으로 맞추는 걸 추천)
mapSheetMngHstEntity.createdDate, mapInkx5kEntity.fid, // 또는 mapInkx5kEntity.fid.intValue()
// ✅ createdDate 말고 ZonedDateTime으로 매핑된 필드로
mapSheetMngHstEntity.createdDate, // (예시)
mapSheetMngHstEntity.syncState, mapSheetMngHstEntity.syncState,
mapSheetMngHstEntity.syncTfwFileName, mapSheetMngHstEntity.syncTfwFileName,
mapSheetMngHstEntity.syncTifFileName, mapSheetMngHstEntity.syncTifFileName,