Merge remote-tracking branch 'origin/master'

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;
 
     /** 不合格数量 */

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeParam.java

@@ -3,6 +3,7 @@ package com.bonus.canteen.core.report.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -12,16 +13,15 @@ import java.util.List;
 @Data
 public class UserIncomeOutcomeParam implements Serializable {
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime startDateTime;
+    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String startDateTime;
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime endDateTime;
+   // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String endDateTime;
     private List<Long> deptIdList;
     private String searchValue;
 
-    public UserIncomeOutcomeParam() {
-        this.endDateTime = LocalDateTime.now().plusDays(7).with(LocalTime.MAX);
-        this.startDateTime = LocalDateTime.now().minusDays(7).with(LocalTime.MIN);
-    }
+
 }

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml

@@ -263,12 +263,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             '系统' as data_form,
             did.expire_time,
             CASE
-                WHEN did.expire_time  <![CDATA[ < ]]> NOW() THEN 1  -- 已过期
-        WHEN TIMESTAMPDIFF(DAY, NOW(), did.expire_time) <![CDATA[  <= ]]> 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  <![CDATA[ < ]]>CURDATE() THEN 1
+            WHEN TIMESTAMPDIFF(DAY, CURDATE(), did.expire_time) <![CDATA[  <= ]]> 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,