From 936b4ebea863c0228778726386df9ba151de3d30 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 5 Dec 2025 16:38:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuWarehouseMaterialCrkInfoController.java | 3 +++ .../modules/cgd/entity/NuWarehouseMaterialCrkInfo.java | 9 +++++---- .../impl/BlWarehouseMaterialInfoServiceImpl.java | 10 +++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuWarehouseMaterialCrkInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuWarehouseMaterialCrkInfoController.java index 72a92959..b8469fa5 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuWarehouseMaterialCrkInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuWarehouseMaterialCrkInfoController.java @@ -10,6 +10,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; @@ -70,6 +72,7 @@ public class NuWarehouseMaterialCrkInfoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(nuWarehouseMaterialCrkInfo, req.getParameterMap()); + queryWrapper.like(StringUtils.isNotBlank(nuWarehouseMaterialCrkInfo.getParamDate()),"create_time", nuWarehouseMaterialCrkInfo.getParamDate()); Page page = new Page(pageNo, pageSize); IPage pageList = nuWarehouseMaterialCrkInfoService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java index 61053c77..12ba7427 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -95,4 +93,7 @@ public class NuWarehouseMaterialCrkInfo implements Serializable { private BigDecimal newPrice; @Dict(dicCode = "crk_status") private String crkStatus; + + @TableField(exist = false) + private String paramDate; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java index 0f40588b..37cc9c45 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java @@ -87,34 +87,34 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl cgdMainList = nuInvoicingCgdMainMapper.selecCgdWlsfzytList(wlId); if(cgdMainList.size()>0){ - map.put("message","采购单数据有占用，请先清空占用信息后再停用"); + map.put("message","采购单数据有占用，请先清空占用信息后再进行操作"); map.put("success",false); return map; } //查询采购车的购物数据是否有 List qgdInfoList = qgdInfoMapper.selectList(new QueryWrapper().eq("wl_id", wlId)); if(qgdInfoList.size()>0){ - map.put("message","采购单购物车数据有占用，请先清空占用信息后再停用"); + map.put("message","采购单购物车数据有占用，请先清空占用信息后再进行操作"); map.put("success",false); return map; } //查询请领单购物车是否有数据 List qldGwcList = qldGwcMapper.selectList(new QueryWrapper().eq("wl_id", wlId)); if(qldGwcList.size()>0){ - map.put("message","请领单购物车有占用，请先清空占用信息后再停用"); + map.put("message","请领单购物车有占用，请先清空占用信息后再进行操作"); map.put("success",false); return map; } //查询请领单是否有占用的数据 List qldMainList = qldMainMapper.selectQldWlsfzyList(wlId); if(qldMainList.size()>0){ - map.put("message","请领单数据有占用，请先清空占用信息后再停用"); + map.put("message","请领单数据有占用，请先清空占用信息后再进行操作"); map.put("success",false); return map; }