diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java index c9d5a258..fd00d6f4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java @@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -44,9 +43,8 @@ public class AssayContentController extends BladeController { */ @GetMapping("/page") @Parameters({ - @Parameter(name = "wcId", description = "作业中心", in = ParameterIn.QUERY, schema = @Schema(type = "string")), - @Parameter(name = "status", description = "状态(10000:未使用;10001:已使用;10002:已过期)", in = ParameterIn.QUERY, schema = @Schema(type = "string")) - }) + @Parameter(name = "wcId", description = "作业中心", in = ParameterIn.QUERY), + @Parameter(name = "status", description = "状态(10000:未使用;10001:已使用;10002:已过期)", in = ParameterIn.QUERY)}) @Operation(summary = "分页", description = "") public R> page(@Parameter(hidden = true) AssayContent entity, Query query) { IPage page = assayContentService.selectPage(Condition.getPage(query), entity); @@ -110,7 +108,7 @@ public class AssayContentController extends BladeController { */ @GetMapping("/detailListNoUsed") @Operation(summary = "未使用的化验含量明细列表", description = "") - public R> detailListNoUsed(@Parameter(hidden = true) Long workCenterId) { + public R> detailListNoUsed(@Parameter(description = "作业中心id", required = true) Long workCenterId) { List detailList = assayContentService.detailListNoUsed(workCenterId); return R.data(detailList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml index f8425be3..72ee3e6a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml @@ -5,7 +5,7 @@