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

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java

src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java

@@ -41,7 +41,6 @@ public class MapSheetMngCoreService {
     return mapSheetMngRepository.findMapSheetMngYyyyList();
   }
 
-
   public MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy) {
     return mapSheetMngRepository.findMapSheetMng(mngYyyy);
   }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java

@@ -170,14 +170,14 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
     return foundContent;
   }
 
-  public List<Integer> findMapSheetMngYyyyList(){
+  public List<Integer> findMapSheetMngYyyyList() {
     List<Integer> foundContent =
-      queryFactory
-        .select(mapSheetMngEntity.mngYyyy)
-        .from(mapSheetMngEntity)
-        .where(mapSheetMngEntity.mngState.ne("COMPLETE"))
-        .orderBy(mapSheetMngEntity.mngYyyy.desc())
-        .fetch();
+        queryFactory
+            .select(mapSheetMngEntity.mngYyyy)
+            .from(mapSheetMngEntity)
+            .where(mapSheetMngEntity.mngState.ne("COMPLETE"))
+            .orderBy(mapSheetMngEntity.mngYyyy.desc())
+            .fetch();
 
     return foundContent;
   }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMgmtRepositoryImpl.java

@@ -65,7 +65,14 @@ public class ModelMgmtRepositoryImpl extends QuerydslRepositorySupport
                     ModelMgmtDto.ModelList.class,
                     Expressions.numberTemplate(
                         Integer.class, "row_number() over(order by {0} desc)", sortColumn),
-                    modelMgmtEntity.modelVer,
+                    Expressions.stringTemplate(
+                            "concat({0}, {1}, {2}, {3}, {4})",
+                            modelMgmtEntity.modelVer,
+                            ".",
+                            modelMgmtEntity.hyperVer,
+                            ".",
+                            modelMgmtEntity.epochVer)
+                        .as("modelVer"),
                     modelMgmtEntity.dockerFileNm,
                     modelMgmtEntity.modelVer.as("modelType"),
                     Expressions.stringTemplate(