From c5d29fa1d99f03363f72dc30aded58bbb87f2623 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Wed, 25 Mar 2026 21:35:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AE=9A=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/basic/pojo/entity/MaterialQuota.java | 7 +++++++ .../desk/quality/controller/LiquidTankController.java | 1 + 2 files changed, 8 insertions(+) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java index 70196c1a..d123914a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java @@ -4,6 +4,8 @@ package org.springblade.desk.basic.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -83,26 +85,31 @@ public class MaterialQuota extends BaseEntity { * 镀层厚度 */ @Schema(description = "镀层厚度") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal thickness; /** * 定额 */ @Schema(description = "定额") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal quota; /** * 小批量定额 */ @Schema(description = "小批量定额") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal smallBatQuota; /** * 大批量定额 */ @Schema(description = "大批量定额") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal bigBatQuota; /** * 局部镀定额 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @Schema(description = "局部镀定额") private BigDecimal localBatQuota; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java index 529b3059..c1d96438 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java @@ -113,6 +113,7 @@ public class LiquidTankController extends BladeController { public R> list(@Parameter(hidden = true) @RequestParam Map liquidTank, Query query) { QueryWrapper qw = Condition.getQueryWrapper(liquidTank, LiquidTank.class); + qw.orderByDesc("CREATE_TIME"); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = LiquidTankWrapper.build().pageVO(pages);