diff --git a/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java b/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java index 00dbb0e..4a6b150 100644 --- a/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java +++ b/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java @@ -33,8 +33,8 @@ public class EngineParamDetailController { //参数列表查询 @GetMapping("/selectParamList") - public Response selectParamList(@RequestParam(value = "modelID", required = false) String modelID) { - Map> list = engineParamDetailService.selectParamList(modelID); + public Response selectParamList(@RequestParam(value = "modelID", required = false) String modelID,@RequestParam(value = "tcData", required = false) String tcData) { + Map> list = engineParamDetailService.selectParamList(modelID,tcData); return Response.ok().data(list); } //参数列表查询 diff --git a/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java b/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java index 09c5c4a..ef6773c 100644 --- a/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java +++ b/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java @@ -23,7 +23,7 @@ import java.util.Map; public interface EngineParamDetailService { - HashMap> selectParamList(String modelID); + HashMap> selectParamList(String modelID,String tcData); void excelImport(MultipartFile file,String modelId); diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java index 80a0785..3c85ef8 100644 --- a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java @@ -78,8 +78,13 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { * @return */ @Override - public HashMap> selectParamList(String modelID) { - List parameters = selectAllByNewVersion(); + public HashMap> selectParamList(String modelID, String tcData) { + List parameters = new ArrayList<>(); + if (ObjectUtils.isNotEmpty(tcData) && "tc".equals(tcData)) { + parameters = selectAllAndTcByNewVersion(); + } else { + parameters = selectAllByNewVersion(); + } List