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

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

Browse Source
This commit is contained in:
Moon
2025-12-23 14:18:03 +09:00
parent a8b649519b 5a6b785c72
commit 2352a1acad
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,8 +425,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum)
.as("map50kName"), .as("map50kName"),
Expressions.stringTemplate( Expressions.stringTemplate(
"({0},{1})", "({0},{1})", mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum)
mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum)
.as("map5kName"), .as("map5kName"),
Expressions.stringTemplate( Expressions.stringTemplate(
"concat({0},substring({1}, 6, 8))", "concat({0},substring({1}, 6, 8))",

3
src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobApiController.java
View File

@@ -39,8 +39,7 @@ public class MapSheetMngFileJobApiController {
}) })
@PutMapping("/mng-sync-job") @PutMapping("/mng-sync-job")
public ApiResponseDto<String> mngSyncOnOff( public ApiResponseDto<String> mngSyncOnOff(
@RequestParam boolean jobStart, @RequestParam boolean jobStart, @RequestParam int pageSize) {
@RequestParam int pageSize) {
mapSheetMngFileJobController.setSchedulerEnabled(jobStart); mapSheetMngFileJobController.setSchedulerEnabled(jobStart);
mapSheetMngFileJobController.setMngSyncPageSize(pageSize); mapSheetMngFileJobController.setMngSyncPageSize(pageSize);