From d9f0155f0804d17bac2a903184745f7835dadb8e Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Thu, 15 May 2025 16:12:10 +0800 Subject: [PATCH] dev --- .../controller/goods/GoodsController.java | 1 - .../InventorySupplierController.java | 16 ++------- .../server/entity/goods/dto/GoodsQuery.java | 2 +- .../server/entity/goods/vo/GoodsDetailVo.java | 1 + .../entity/inventory/dto/SupplierQuery.java | 1 + .../server/service/goods/GoodsService.java | 34 +++++++++---------- .../inventory/InventorySupplierService.java | 26 ++++++++++++++ 7 files changed, 49 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java index a1bdd3c..fe5e14e 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java @@ -92,7 +92,6 @@ public class GoodsController extends BaseController { */ @RequestMapping("searchDetail") public Result> searchGoodeDetail() { - QueryWrapper queryWrapper = new QueryWrapper<>(); GoodsQuery goodsQuery = parmsUtil.getObject("query", GoodsQuery.class); Page result = goodsService.searchGoodeDetail(goodsQuery); return success(result); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java index 2de4b55..b3c87fa 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java @@ -25,19 +25,7 @@ public class InventorySupplierController extends BaseController { @RequestMapping("/list") public Result list() { SupplierQuery query= parmsUtil.getObject("query", SupplierQuery.class); - if (query == null){ - return error("没有带查询条件"); - } - QueryWrapper queryWrapper = new QueryWrapper(); - if(query.getTurn() != null){ - queryWrapper.eq("turn",1); - } - if(query.getPageNum() == null || query.getPageNum() == 0){ - query.setPageNum(1); - } - if (query.getPageSize() == null || query.getPageSize() == 0){ - query.setPageSize(Constants.DetailPageSize); - } + return success(inventorySupplierService.listPage(query)); } @@ -51,4 +39,6 @@ public class InventorySupplierController extends BaseController { inventorySupplierService.saveOrUpdate(inventorySupplier); return success(); } + + } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/goods/dto/GoodsQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/goods/dto/GoodsQuery.java index c27d200..eada019 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/goods/dto/GoodsQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/goods/dto/GoodsQuery.java @@ -13,7 +13,7 @@ public class GoodsQuery { private Integer minInterestRate; private Integer maxInterestRate; private Integer inventoryNumber; - private boolean status; + private Boolean saleStatus; private Integer pageSize; private Integer pageNum; private List interestRateIntervalList; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsDetailVo.java b/src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsDetailVo.java index 6ae673b..efd4e0b 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsDetailVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsDetailVo.java @@ -68,6 +68,7 @@ public class GoodsDetailVo { private Integer pricingModel; private Integer makeUp; + private Boolean status; private String cateName; private Boolean saleStatus; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/SupplierQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/SupplierQuery.java index 9a02420..d107f18 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/SupplierQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/SupplierQuery.java @@ -9,4 +9,5 @@ public class SupplierQuery { private Integer pageNum; private Integer pageSize; private Integer turn; + private String keyword; } diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java index 22cb070..5ed6767 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java @@ -206,9 +206,9 @@ public class GoodsService { if (goodsQuery.getCateId() != null) { queryWrapper.eq("cate_id", goodsQuery.getCateId()); } - if (goodsQuery.isStatus()) { + if (goodsQuery.getSaleStatus() != null) { //是否只查询可售商品 - queryWrapper.eq("status", goodsQuery.isStatus()); + queryWrapper.eq("sale_status", goodsQuery.getSaleStatus()); } if (goodsQuery.getInventoryNumber() != null) { queryWrapper.and(wrapper -> { @@ -294,24 +294,24 @@ public class GoodsService { */ public List search(String keyword) { QueryWrapper queryWrapper = new QueryWrapper<>(); - + queryWrapper.eq("sale_status",true); if (keyword != null && !keyword.isEmpty()) { - keyword = keyword.toUpperCase(); - queryWrapper.like("name", keyword); - queryWrapper.or(); - queryWrapper.like("common_name", keyword); - queryWrapper.or(); - queryWrapper.like("barcode", keyword); - queryWrapper.or(); - queryWrapper.like("hilist_code", keyword); - queryWrapper.or(); - queryWrapper.like("producer", keyword); - queryWrapper.or().like("pinyin_full", keyword); - queryWrapper.or().like("pinyin_first", keyword); + String finalKeyword = keyword.toUpperCase(); + queryWrapper.and(wrapper -> { + wrapper.like("name", finalKeyword); + wrapper.or(); + wrapper.like("common_name", finalKeyword); + wrapper.or(); + wrapper.like("barcode", finalKeyword); + wrapper.or(); + wrapper.like("hilist_code", finalKeyword); + wrapper.or(); + wrapper.like("producer", finalKeyword); + wrapper.or().like("pinyin_full", finalKeyword); + wrapper.or().like("pinyin_first", finalKeyword); + }); } queryWrapper.orderByDesc("use_num"); - - queryWrapper.last("limit 20"); List list = goodsMapper.selectList(queryWrapper); diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventorySupplierService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventorySupplierService.java index 4d9bc85..f67dcad 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventorySupplierService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventorySupplierService.java @@ -1,6 +1,8 @@ package com.syjiaer.clinic.server.service.inventory; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.syjiaer.clinic.server.common.constants.Constants; +import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.inventory.InventorySupplier; import com.syjiaer.clinic.server.entity.inventory.dto.SupplierQuery; @@ -21,6 +23,30 @@ public class InventorySupplierService extends BaseService { */ public Page listPage(SupplierQuery query) { QueryWrapper queryWrapper = new QueryWrapper<>(); + if (query == null){ + throw new MessageException("没有带查询条件"); + } + if(query.getTurn() != null){ + queryWrapper.eq("turn",1); + } + if (query.getKeyword() != null && !query.getKeyword().isEmpty()){ + String finalKeyword = query.getKeyword(); + queryWrapper.and(wrapper -> { + wrapper.like("name", finalKeyword); + wrapper.or(); + wrapper.like("contact_name", finalKeyword); + wrapper.or(); + wrapper.like("contact_tel", finalKeyword); + }); + } + + + if(query.getPageNum() == null || query.getPageNum() == 0){ + query.setPageNum(1); + } + if (query.getPageSize() == null || query.getPageSize() == 0){ + query.setPageSize(Constants.DetailPageSize); + } if(query.getTurn() != null){ queryWrapper.eq("turn",1); }