From 26a7617dec672be4fefb491bd9a0be4f8da00525 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 29 Jul 2022 14:39:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=88=86=E4=BB=93=E7=BB=91=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=92=8C=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/WareHouseController.java | 45 ++++++++++++------- .../inventory/FilterInvLinkDataRequest.java | 19 ++++++++ .../inout/WarehouseBussinessTypeService.java | 4 ++ .../service/inout/WarehouseUserService.java | 4 +- .../WarehouseBussinessTypeServiceImpl.java | 13 ++++++ .../inout/impl/WarehouseUserServiceImpl.java | 12 +++-- .../mybatis/mapper/basic/BasicExportDao.xml | 2 +- .../mybatis/mapper/basic/BasicThirdSysDao.xml | 4 +- 8 files changed, 79 insertions(+), 24 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvLinkDataRequest.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 2cc20c0..0148cf2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -22,6 +22,7 @@ import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.sale.admin.req.inout.*; +import com.glxp.sale.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.BussinessTypResponse; import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse; @@ -1188,27 +1189,41 @@ public class WareHouseController { * @return */ @AuthRuleAnnotation("") - @GetMapping("/warehouse/inout/warehouseUserList") - public BaseResponse getWarehouseUserList(String code) { - if (StringUtils.isBlank(code)) + @PostMapping("/warehouse/inout/warehouseUserList") + public BaseResponse getWarehouseUserList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest) { + if (null == filterInvLinkDataRequest || StrUtil.isBlank(filterInvLinkDataRequest.getCode())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - List warehouseUserEntities = warehouseUserService.getListByCode(code); + } + List warehouseUserEntities = warehouseUserService.getListByCode(filterInvLinkDataRequest); + PageInfo pageInfo = new PageInfo<>(warehouseUserEntities); + List result = new ArrayList<>(); - warehouseUserEntities.forEach(warehouseUserEntity -> { - WarehouseUserResponse warehouseUserResponse = new WarehouseUserResponse(); - BeanUtils.copyProperties(warehouseUserEntity, warehouseUserResponse); - warehouseUserResponse.setUserid(warehouseUserEntity.getUserid() + ""); - result.add(warehouseUserResponse); - }); - return ResultVOUtils.success(result); + if (CollUtil.isNotEmpty(pageInfo.getList())) { + pageInfo.getList().forEach(warehouseUserEntity -> { + WarehouseUserResponse warehouseUserResponse = new WarehouseUserResponse(); + BeanUtils.copyProperties(warehouseUserEntity, warehouseUserResponse); + warehouseUserResponse.setUserid(warehouseUserEntity.getUserid() + ""); + result.add(warehouseUserResponse); + }); + } + PageSimpleResponse response = new PageSimpleResponse<>(); + response.setList(result); + response.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(response); } @AuthRuleAnnotation("") - @GetMapping("/warehouse/inout/warehouseBussniessTypeList") - public BaseResponse getWarehouseBussniessTypeList(String code) { - if (StrUtil.isBlank(code)) + @PostMapping("/warehouse/inout/warehouseBussniessTypeList") + public BaseResponse getWarehouseBussniessTypeList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest) { + if (null == filterInvLinkDataRequest || StrUtil.isBlank(filterInvLinkDataRequest.getCode())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - return ResultVOUtils.success(warehouseBussinessTypeService.getListByCode(code)); + } + List warehouseBussniessTypeList = warehouseBussinessTypeService.getWarehouseBussniessTypeList(filterInvLinkDataRequest); + PageInfo pageInfo = new PageInfo<>(warehouseBussniessTypeList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setList(pageInfo.getList()); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(pageSimpleResponse); } @AuthRuleAnnotation("") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvLinkDataRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvLinkDataRequest.java new file mode 100644 index 0000000..7919e31 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvLinkDataRequest.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.req.inventory; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 查询仓库关联的数据请求参数 + */ +@Data +public class FilterInvLinkDataRequest extends ListPageRequest { + + //分仓码 + @NotEmpty(message = "请选择分仓！") + private String code; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java index 42b352e..c320c65 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.service.inout; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.req.basic.FilterInvBusTypeRequest; +import com.glxp.sale.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.sale.admin.res.basic.BussinessTypResponse; import java.util.List; @@ -34,4 +35,7 @@ public interface WarehouseBussinessTypeService { * @param id */ void deleteWarehouseByssuinessType(Integer id); + + + List getWarehouseBussniessTypeList(FilterInvLinkDataRequest filterInvLinkDataRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java index 5265e25..1189226 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java @@ -2,8 +2,8 @@ package com.glxp.sale.admin.service.inout; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; +import com.glxp.sale.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,7 +18,7 @@ public interface WarehouseUserService { WarehouseUserEntity selectById(Integer id); - List getListByCode(String code); + List getListByCode(FilterInvLinkDataRequest filterInvLinkDataRequest); List selectCodeByUser(String userId); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java index af444a3..2d1583b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inout.WarehouseBussinessTypeDao; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.req.basic.FilterInvBusTypeRequest; +import com.glxp.sale.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.sale.admin.res.basic.BussinessTypResponse; import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService; import lombok.extern.slf4j.Slf4j; @@ -73,4 +74,16 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType warehouseBussinessTypeDao.deleteByPrimaryKey(id); } } + + @Override + public List getWarehouseBussniessTypeList(FilterInvLinkDataRequest filterInvLinkDataRequest) { + if (filterInvLinkDataRequest == null) { + return Collections.emptyList(); + } + if (filterInvLinkDataRequest.getPage() != null) { + int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit()); + } + return warehouseBussinessTypeDao.selectListByCode(filterInvLinkDataRequest.getCode()); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java index ffaf8b7..28dd992 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inout.WarehouseUserDao; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; +import com.glxp.sale.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import com.glxp.sale.admin.service.inout.WarehouseUserService; import lombok.extern.slf4j.Slf4j; @@ -35,12 +36,15 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { } @Override - public List getListByCode(String code) { - List warehouseUserEntities = warehouseUserDao.selectListByCode(code); - if (CollUtil.isEmpty(warehouseUserEntities)) { + public List getListByCode(FilterInvLinkDataRequest filterInvLinkDataRequest) { + if (filterInvLinkDataRequest == null) { return Collections.emptyList(); } - return warehouseUserEntities; + if (filterInvLinkDataRequest.getPage() != null) { + int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit()); + } + return warehouseUserDao.selectListByCode(filterInvLinkDataRequest.getCode()); } @Override diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml index f79be70..e95e8ed 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml @@ -8,7 +8,7 @@ select * from basic_export_status - and id = #{id} + and id like concat('%', #{id}, '%') and status = #{status} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml index 6a31953..595fd67 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml @@ -36,10 +36,10 @@ SELECT * FROM basic_third_sys - AND thirdId = #{thirdId} + AND thirdId like concat('%', #{thirdId}, '%') - AND thirdName = #{thirdName} + AND thirdName like concat('%', #{thirdName}, '%') AND enabled = #{enabled}