동물원예제 hidden,모델등록이력 API 커밋

src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java

@@ -89,13 +89,14 @@ public class ModelMngApiController {
     @RequestParam int page,
     @RequestParam(defaultValue = "20") int size,
     @RequestParam(required = false) String searchVal,
-    @RequestParam String searchColumn
+    @RequestParam(required = false) String searchColumn
   ) {
     ModelMngDto.searchReq searchReq =
-      new ModelMngDto.searchReq(page, size, searchColumn + ",desc");
+      new ModelMngDto.searchReq(page, size, Optional.ofNullable(searchColumn).orElse("createdDate") + ",desc");
+      //searchColumn:: Entity 컬럼명칭으로 -> 기본값 = 등록일 createdDate, (선택) 배포일 deployDttm
 
     Page<ModelMngDto.ModelRegHistory> result =
-      modelMngService.getRegHistoryList(searchReq, startDate, endDate);
+      modelMngService.getRegHistoryList(searchReq, startDate, endDate, searchVal);
 
     return ApiResponseDto.ok(result);
   }

src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java

@@ -135,6 +135,7 @@ public class ModelMngDto {
     private String modelVer;
     private String strCreatedDttm;
     private String usedState;
+    private String deployState;
     private String strDeployDttm;
   }
 }

src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java

@@ -40,7 +40,7 @@ public class ModelMngService {
     return modelMngCoreService.delete(id);
   }
 
-  public Page<ModelMngDto.ModelRegHistory> getRegHistoryList(ModelMngDto.searchReq searchReq, LocalDate startDate, LocalDate endDate) {
-    return modelMngCoreService.getRegHistoryList(searchReq, startDate, endDate);
+  public Page<ModelMngDto.ModelRegHistory> getRegHistoryList(ModelMngDto.searchReq searchReq, LocalDate startDate, LocalDate endDate, String searchVal) {
+    return modelMngCoreService.getRegHistoryList(searchReq, startDate, endDate, searchVal);
   }
 }