From 4a3210596a4efe0a846493d104c0c1aa51334072 Mon Sep 17 00:00:00 2001 From: "wenkuan.shi" Date: Wed, 26 Jun 2024 17:00:44 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/spring/modules/material/data/FindByNum.java | 2 ++ src/main/resources/mapper/material/SeekByTransMapper.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/spring/modules/material/data/FindByNum.java b/src/main/java/com/spring/modules/material/data/FindByNum.java index 38f2e83..ef78f67 100644 --- a/src/main/java/com/spring/modules/material/data/FindByNum.java +++ b/src/main/java/com/spring/modules/material/data/FindByNum.java @@ -41,5 +41,7 @@ public class FindByNum extends QueryPage { private Date expiredDate; //卷数量 private int num; + //剩余有效期天数 + private int daysUntilExpired; } diff --git a/src/main/resources/mapper/material/SeekByTransMapper.xml b/src/main/resources/mapper/material/SeekByTransMapper.xml index ca90174..6cc5d76 100644 --- a/src/main/resources/mapper/material/SeekByTransMapper.xml +++ b/src/main/resources/mapper/material/SeekByTransMapper.xml @@ -70,9 +70,11 @@ d.part_desc, c.itemNo, c.expiredDate, + DATEDIFF(day, GETDATE(), c.expiredDate) AS daysUntilExpired, (SELECT COUNT(*) FROM TransDetailsub WHERE transNo = a.transNo AND itemNo = c.itemNo) AS num + FROM TransHeader AS a INNER JOIN TransDetail AS c ON a.Site = c.Site