1.分仓绑定的用户和单据类型添加分页查询功能

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<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getListByCode(code);
+        }
+        List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getListByCode(filterInvLinkDataRequest);
+        PageInfo<WarehouseUserEntity> pageInfo = new PageInfo<>(warehouseUserEntities);
+
         List<WarehouseUserResponse> 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<WarehouseUserResponse> 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<WarehouseBussinessTypeEntity> warehouseBussniessTypeList = warehouseBussinessTypeService.getWarehouseBussniessTypeList(filterInvLinkDataRequest);
+        PageInfo<WarehouseBussinessTypeEntity> pageInfo = new PageInfo<>(warehouseBussniessTypeList);
+        PageSimpleResponse<WarehouseBussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setList(pageInfo.getList());
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
     @AuthRuleAnnotation("")

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;
+
+
+}

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<WarehouseBussinessTypeEntity> getWarehouseBussniessTypeList(FilterInvLinkDataRequest filterInvLinkDataRequest);
 }

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<WarehouseUserEntity> getListByCode(String code);
+    List<WarehouseUserEntity> getListByCode(FilterInvLinkDataRequest filterInvLinkDataRequest);
 
     List<WarehouseUserEntity> selectCodeByUser(String userId);
 

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<WarehouseBussinessTypeEntity> 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());
+    }
 }

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<WarehouseUserEntity> getListByCode(String code) {
-        List<WarehouseUserEntity> warehouseUserEntities = warehouseUserDao.selectListByCode(code);
-        if (CollUtil.isEmpty(warehouseUserEntities)) {
+    public List<WarehouseUserEntity> 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

api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml

@@ -8,7 +8,7 @@
         select * from basic_export_status
         <where>
             <if test="id != '' and id!=null">
-                and id = #{id}
+                and id like concat('%', #{id}, '%')
             </if>
             <if test="status!=null">
                 and status = #{status}

api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml

@@ -36,10 +36,10 @@
         SELECT * FROM basic_third_sys
         <where>
             <if test="thirdId != '' and thirdId != null">
-                AND thirdId = #{thirdId}
+                AND thirdId like concat('%', #{thirdId}, '%')
             </if>
             <if test="thirdName != '' and thirdName != null">
-                AND thirdName = #{thirdName}
+                AND thirdName like concat('%', #{thirdName}, '%')
             </if>
             <if test="enabled != null">
                 AND enabled = #{enabled}