From 517bf8b0a110b138b7e3bd84836d0659c57352b9 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 18 Nov 2025 09:23:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingApi.java | 14 +++++- .../modules/invoicing/api/IInvoicingApi.java | 4 +- .../impl/NuInvoicingCgdMainServiceImpl.java | 44 ++++++++++++++++--- 3 files changed, 53 insertions(+), 9 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index f45e550..ac00414 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -271,11 +271,21 @@ public class InvoicingApi { @ApiOperation(value = "查询拣货照片集合", notes = "查询拣货照片集合") @GetMapping(value = "/queryJhzpList") - public Result> queryCgdInfoList(WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, + public Result>> queryCgdInfoList(WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - IPage pageList = invoicingApi.queryJhzpList(pageNo, pageSize, warehouseMaterialCrkInfoEntityDto,req); + List> pageList = invoicingApi.queryJhzpList(pageNo, pageSize, warehouseMaterialCrkInfoEntityDto,req); + return Result.OK(pageList); + } + + @ApiOperation(value = "查询出入库记录", notes = "查询出入库记录") + @GetMapping(value = "/queryCrkList") + public Result> queryCrkList(WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = invoicingApi.queryCrkList(pageNo, pageSize, warehouseMaterialCrkInfoEntityDto,req); return Result.OK(pageList); } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index 5679514..7a4a6eb 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -63,7 +63,7 @@ public interface IInvoicingApi { List> getCgrList(CgdMainEntity cgdMainEntityDto); - IPage queryJhzpList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req); + List> queryJhzpList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req); String addSxd(CgdSxdEntity cgdSxdEntityDto); @@ -74,4 +74,6 @@ public interface IInvoicingApi { String pickingInfo(CgdInfoEntity cgdInfoEntityDto); String editPrice(CgdInfoEntity cgdInfoEntityDto); + + IPage queryCrkList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req); } 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 1b29e14..b64c50f 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 @@ -645,18 +645,35 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl queryJhzpList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req) { + public List> queryJhzpList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req) { NuWarehouseMaterialCrkInfo warehouseMaterialCrkInfo = new NuWarehouseMaterialCrkInfo(); BeanUtils.copyProperties(warehouseMaterialCrkInfoEntityDto,warehouseMaterialCrkInfo); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialCrkInfo, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); queryWrapper.eq("cgd_id",warehouseMaterialCrkInfo.getCgdId()); queryWrapper.isNotNull("jh_pic"); queryWrapper.eq("crk_status","1"); - List list = crkInfoMapper.selectList(page,queryWrapper); - IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); - entityPage.setRecords(BeanUtil.copyToList(list, WarehouseMaterialCrkInfoEntity.class)); - return entityPage; + List list = crkInfoMapper.selectList(queryWrapper); + List> jhlist = new ArrayList<>(); + for(NuWarehouseMaterialCrkInfo crkInfo : list){ + if(StringUtils.isNotBlank(crkInfo.getJhPic())){ + if(crkInfo.getJhPic().indexOf(",")>-1){ + for (String jhPicParam : crkInfo.getJhPic().split(",")){ + Map map = new HashMap<>(); + map.put("jhPic",jhPicParam); + map.put("createTime",crkInfo.getCreateTime()); + map.put("createBy",crkInfo.getCreateBy()); + jhlist.add(map); + } + }else{ + Map map = new HashMap<>(); + map.put("jhPic",crkInfo.getJhPic()); + map.put("createTime",crkInfo.getCreateTime()); + map.put("createBy",crkInfo.getCreateBy()); + jhlist.add(map); + } + } + } + return jhlist; } @Override @@ -887,4 +904,19 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl queryCrkList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req) { + NuWarehouseMaterialCrkInfo warehouseMaterialCrkInfo = new NuWarehouseMaterialCrkInfo(); + BeanUtils.copyProperties(warehouseMaterialCrkInfoEntityDto,warehouseMaterialCrkInfo); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialCrkInfo, req.getParameterMap()); + queryWrapper.eq("nu_id",warehouseMaterialCrkInfo.getNuId()); + queryWrapper.eq("wl_id",warehouseMaterialCrkInfo.getWlId()); + List list = crkInfoMapper.selectList(queryWrapper); + + Page page = new Page<>(pageNo, pageSize); + IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); + entityPage.setRecords(BeanUtil.copyToList(list, WarehouseMaterialCrkInfoEntity.class)); + return entityPage; + } + }