diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java index dae440a5..cc97015b 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java @@ -107,11 +107,11 @@ public class QualityGradeController extends BladeController { @GetMapping("/page") @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入QualityGrade") - public R> page(QualityGradeVO QualityGrade, Query query) { - IPage pages = qualityGradeService.selectQualityGradePage(Condition.getPage(query), QualityGrade); + public R> page(QualityGradeVO qualityGrade, Query query) { + IPage pages = qualityGradeService.selectQualityGradePage(Condition.getPage(query), qualityGrade); List list = pages.getRecords(); - for(QualityGradeVO qualityGradeEntity: list){ - qualityGradeEntity.setTypes(qualityGradeEntity.getType()); + for(QualityGradeVO vo: list){ + vo.setTypes(vo.getType()); } return R.data(pages); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml index 80be6926..ede9c976 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml @@ -17,7 +17,7 @@ - select * from MES_QUALITY_GRADE is_deleted = 0