From 7838b919e4fc40c12d9a99140a14e5a31ecd5cd5 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 9 Jan 2026 09:18:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E9=A2=84=E8=AD=A6=E7=89=A9=E6=96=99=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E5=8F=8A=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/common/system/util/JwtUtil.java | 3 ++- .../cgd/service/impl/NuInvoicingCgdMainServiceImpl.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java index 9df9c68b..9375e63a 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java @@ -39,7 +39,8 @@ import java.util.stream.Collectors; public class JwtUtil { /**Token有效期为7天（Token在reids中缓存时间为两倍）*/ - public static final long EXPIRE_TIME = (7 * 12) * 60 * 60 * 1000; +// public static final long EXPIRE_TIME = (7 * 12) * 60 * 60 * 1000; + public static final long EXPIRE_TIME = (12) * 60 * 60 * 1000; static final String WELL_NUMBER = SymbolConstant.WELL_NUMBER + SymbolConstant.LEFT_CURLY_BRACKET; /** diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index 93fa63c3..658d7c18 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -918,13 +918,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>() ; queryWrapper.eq("nu_id",cgdInfoEntityDto.getNuId()); - queryWrapper.apply("kcsl <= lower_limit");//库存小于下限的数据 + queryWrapper.apply("ljkcsl <= lower_limit");//库存小于下限的数据 queryWrapper.eq("del_flag","0");//查询未删除的数据 queryWrapper.eq("iz_enabled","Y");//查询启用的数据 queryWrapper.eq("isAdd","0");//查询未在购物车里的数据 // queryWrapper.last("limit " + (3-listqg.size())); //库存预警数据 - List list = mterialInfoMapper.selectWaringList(queryWrapper); + Page page = new Page<>(1, 1000); + List list = mterialInfoMapper.queryCgdWaringList(page,queryWrapper); //供应商集合 List gysList = gysMapper.selectList(new QueryWrapper().eq("del_flag","0")); int count = listqg.size();