Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css
This commit is contained in:
commit
c0cbdc831c
@ -101,7 +101,8 @@ public class ModelTrainController {
|
||||
@GetMapping("/list")
|
||||
public ResponseResult list(@RequestParam(defaultValue = "1") Integer current,
|
||||
@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 status,
|
||||
@RequestParam(required = false) String name) {
|
||||
@ -109,8 +110,9 @@ public class ModelTrainController {
|
||||
Page<ModelTrainTask> page = new Page<>(current, size);
|
||||
QueryWrapper<ModelTrainTask> query = new QueryWrapper<>();
|
||||
|
||||
if (algoType != null && !algoType.isBlank()) {
|
||||
query.eq("algorithm_type", algoType);
|
||||
String finalAlgorithmType = (algorithmType != null && !algorithmType.isBlank()) ? algorithmType : algoType;
|
||||
if (finalAlgorithmType != null && !finalAlgorithmType.isBlank()) {
|
||||
query.eq("algorithm_type", finalAlgorithmType);
|
||||
}
|
||||
if (deviceType != null && !deviceType.isBlank()) {
|
||||
query.eq("device_type", deviceType);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user