From b6fe31075341006b39c3e2904ef69021f79cf947 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 11 Dec 2025 09:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=98=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BA=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingPddApi.java | 11 ++++++++++ .../org/jeecg/config/shiro/ShiroConfig.java | 2 +- .../com/nu/modules/invoicing/api/IPddApi.java | 2 ++ .../pdd/mapper/NuInvoicingPddInfoMapper.java | 3 +++ .../mapper/xml/NuInvoicingPddInfoMapper.xml | 3 +++ .../impl/NuInvoicingPddMainServiceImpl.java | 20 +++++++++++++++---- 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingPddApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingPddApi.java index 0d12f8ce..ce07fb4f 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingPddApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingPddApi.java @@ -102,4 +102,15 @@ public class InvoicingPddApi { return Result.error(result.get("message").toString()); } } + + + @ApiOperation(value = "盘点单-查询盘点人列表", notes = "盘点单-查询盘点人列表") + @GetMapping(value = "/queryPddStartByList") + public Result>> queryPddStartByList(InvoicingPddInfoEntity invoicingPddInfoEntity) { + if(StringUtils.isBlank(invoicingPddInfoEntity.getNuId())){ + return Result.error("参数错误，请选择库房"); + } + List> pageList = pddApi.queryPddStartByList(invoicingPddInfoEntity); + return Result.OK(pageList); + } } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 9fcd3fdc..62263175 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -92,7 +92,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/api/tplink/videoStorage/**", "anon"); //视频缓存存储接口 filterChainDefinitionMap.put("/api/pad/invoicing/getShareInfoByCgdId", "anon"); //查询采购单信息（分享接口使用） -// filterChainDefinitionMap.put("/api/pad/invoicing/pdd/**", "anon"); //查询采购单信息（分享接口使用） +// filterChainDefinitionMap.put("/api/pad/invoicing/pdd/**", "anon"); //查询盘点单 // filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口 // filterChainDefinitionMap.put("/api/pad/qingling/**", "anon"); //测试请领对应的接口 filterChainDefinitionMap.put("/iot/tq/api/electricityMeter/**", "anon"); //电表回调 diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IPddApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IPddApi.java index cd108f34..cd8c4aa9 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IPddApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IPddApi.java @@ -18,4 +18,6 @@ public interface IPddApi { Map editPddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity); Map submitPddMain(InvoicingPddMainEntity invoicingPddMainEntity); + + List> queryPddStartByList(InvoicingPddInfoEntity invoicingPddInfoEntity); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java index db40c78e..1e4a577b 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java @@ -2,6 +2,7 @@ package com.nu.modules.pdd.mapper; import java.util.List; +import com.nu.entity.InvoicingPddInfoEntity; import org.apache.ibatis.annotations.Param; import com.nu.modules.pdd.entity.NuInvoicingPddInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -17,4 +18,6 @@ public interface NuInvoicingPddInfoMapper extends BaseMapper void addPddInfo(@Param("nuId") String nuId,@Param("createBy") String createBy,@Param("pddId") String pddId); List selectPydPkdList(@Param("pddId")String pddId); + + List queryPddStartByList(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml index 0f7d1324..b8667e7f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml @@ -29,4 +29,7 @@ + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java index f6d83bee..760618de 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java @@ -32,10 +32,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Description: 进销存-盘点单主表 @@ -64,6 +61,9 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingPddMain, req.getParameterMap(), customeRuleMap); queryWrapper.ge(StringUtils.isNotEmpty(invoicingPddMainEntity.getStartTime()),"create_time",invoicingPddMainEntity.getStartTime()); queryWrapper.le(StringUtils.isNotEmpty(invoicingPddMainEntity.getEndTime()),"create_time",invoicingPddMainEntity.getEndTime()); + if(StringUtils.isNotBlank(invoicingPddMainEntity.getPddInfo())){ + queryWrapper.apply("(pdd_no like ","%"+invoicingPddMainEntity.getPddInfo()+"%"," or pdd_start_by like %"+invoicingPddMainEntity.getPddInfo()+"%)" ); + } if(StringUtils.equals("1",invoicingPddMainEntity.getPydOrPkd())){ queryWrapper.gt("pyd_num",0); }else if (StringUtils.equals("2",invoicingPddMainEntity.getPydOrPkd())){ @@ -220,4 +220,16 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl> queryPddStartByList(InvoicingPddInfoEntity invoicingPddInfoEntity) { + List list = pddInfoMapper.queryPddStartByList(invoicingPddInfoEntity); + List> list1 = new ArrayList<>(); + for(NuInvoicingPddInfo param : list){ + Map map = new HashMap<>(); + map.put("name",param.getCreateBy()); + list1.add(map); + } + return list1; + } }