From 873534b8d60efa2546c10e18dcd8c222a26d2441 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Wed, 25 Mar 2026 15:50:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AD=89=E7=BA=A7=E5=92=8C?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E7=BB=B4=E6=8A=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/quality/pojo/entity/IndicatorYear.java | 4 ++-- .../scheduling/controller/QualityGradeController.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) 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)); }