From c21e94c02919f0336cc3395da7e1bc045ff0cd36 Mon Sep 17 00:00:00 2001 From: lizhenhua <1075222162@qq.com> Date: Mon, 8 Sep 2025 17:02:58 +0800 Subject: [PATCH] =?UTF-8?q?bug=20=E9=A3=9F=E5=A0=82=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E=E6=97=B6=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E4=B8=BA999=20=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ims/domain/param/ImsIntoInventoryDetailAdd.java | 12 +++++------- .../main/resources/mapper/ims/ImsInventoryMapper.xml | 12 ++++++------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryDetailAdd.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryDetailAdd.java index de961d0..12c791f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryDetailAdd.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryDetailAdd.java @@ -8,9 +8,7 @@ import lombok.Data; import lombok.ToString; import org.checkerframework.checker.units.qual.N; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import javax.validation.constraints.*; import java.io.Serializable; /** @@ -63,7 +61,7 @@ public class ImsIntoInventoryDetailAdd implements Serializable @ApiModelProperty(value = "单价") @NotNull(message = "单价不能为空") @Min(value = 0, message = "单价不能小于0") - @Max(value = 9999, message = "单价不能大于9999") + @Max(value = 99900, message = "单价不能大于999") private Long unitPrice; /** 总价 */ @@ -77,10 +75,10 @@ public class ImsIntoInventoryDetailAdd implements Serializable private BigDecimal deliveryNum; /** 入库合格数量 */ - @ApiModelProperty(value = "入库合格数量") + @ApiModelProperty(value = "入库合格数量", required = true, example = "10") @NotNull(message = "入库合格数量不能为空") - @Min(value = 0, message = "入库合格数量不能小于0") - @Max(value = 9999, message = "入库合格数量不能大于9999") + @DecimalMin(value = "0", message = "入库合格数量不能小于0") + @DecimalMax(value = "99900", message = "入库合格数量不能大于999") private BigDecimal purNum; /** 不合格数量 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml index 392faa9..c6d734c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml @@ -257,12 +257,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" '系统' as data_form, did.expire_time, CASE - WHEN did.expire_time NOW() THEN 1 -- 已过期 - WHEN TIMESTAMPDIFF(DAY, NOW(), did.expire_time) mm.shelf_life_days THEN 3 -- 临期 - ELSE 2 -- 正常 - END AS expireState, - TIMESTAMPDIFF( DAY, NOW(), did.expire_time ) expireDay, - did.unit_id, + WHEN did.expire_time CURDATE() THEN 1 + WHEN TIMESTAMPDIFF(DAY, CURDATE(), did.expire_time) mm.shelf_life_days THEN 3 + ELSE 2 + END AS expireState, + TIMESTAMPDIFF( DAY, NOW(), did.expire_time ) expireDay, + did.unit_id, du.unit_name, did.supplier_id,