diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java index d855bf58..cc7cf770 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java @@ -79,12 +79,12 @@ public class IndicatorYear extends BaseEntity { * [作业中心]id */ @Schema(description = "[作业中心]id") - private Long workstationId; + private String workstationId; /** * [班组]id */ @Schema(description = "[班组]id") - private Long teamId; + private String teamId; /** * 实际值 */ 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 80cd06ba..c40fe458 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 @@ -94,6 +94,10 @@ public class QualityGradeController extends BladeController { @Operation(summary = "分页", description = "传入QualityGrade") public R> list(@Parameter(hidden = true) @RequestParam Map QualityGrade, Query query) { IPage pages = qualityGradeService.page(Condition.getPage(query), Condition.getQueryWrapper(QualityGrade, QualityGradeEntity.class)); + List list = pages.getRecords(); + for(QualityGradeEntity qualityGradeEntity: list){ + qualityGradeEntity.setTypes(qualityGradeEntity.getType()); + } return R.data(QualityGradeWrapper.build().pageVO(pages)); }