ThbTech/JavaProjectRepo
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css

Browse Source
This commit is contained in:
limengnan 2026-05-26 17:16:19 +08:00
commit c0cbdc831c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
business-css/src/main/java/com/yfd/business/css/controller/ModelTrainController.java
View File

@ -101,7 +101,8 @@ public class ModelTrainController {
@GetMapping("/list") @GetMapping("/list")
public ResponseResult list(@RequestParam(defaultValue = "1") Integer current, public ResponseResult list(@RequestParam(defaultValue = "1") Integer current,
@RequestParam(defaultValue = "10") Integer size, @RequestParam(defaultValue = "10") Integer size,
@RequestParam(required = false) String algoType, @RequestParam(value = "algorithmType", required = false) String algorithmType,
@RequestParam(value = "algoType", required = false) String algoType,
@RequestParam(required = false) String deviceType, @RequestParam(required = false) String deviceType,
@RequestParam(required = false) String status, @RequestParam(required = false) String status,
@RequestParam(required = false) String name) { @RequestParam(required = false) String name) {
@ -109,8 +110,9 @@ public class ModelTrainController {
Page<ModelTrainTask> page = new Page<>(current, size); Page<ModelTrainTask> page = new Page<>(current, size);
QueryWrapper<ModelTrainTask> query = new QueryWrapper<>(); QueryWrapper<ModelTrainTask> query = new QueryWrapper<>();
if (algoType != null && !algoType.isBlank()) { String finalAlgorithmType = (algorithmType != null && !algorithmType.isBlank()) ? algorithmType : algoType;
query.eq("algorithm_type", algoType); if (finalAlgorithmType != null && !finalAlgorithmType.isBlank()) {
query.eq("algorithm_type", finalAlgorithmType);
} }
if (deviceType != null && !deviceType.isBlank()) { if (deviceType != null && !deviceType.isBlank()) {
query.eq("device_type", deviceType); query.eq("device_type", deviceType);