From f9f64870a7141973498df2b62c051e940549d1bf Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 7 Feb 2023 11:16:37 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/InvWarehouseController.java | 16 ++++++++++++++-- .../com/glxp/api/dao/auth/WarehouseUserDao.java | 2 ++ .../api/req/auth/FilterInvLinkDataRequest.java | 4 ++++ .../auth/impl/WarehouseUserServiceImpl.java | 2 +- .../mybatis/mapper/auth/WarehouseUserDao.xml | 17 +++++++++++++++++ 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 48669818f..0ec755607 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -396,8 +396,20 @@ public class InvWarehouseController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); - PageInfo pageInfo = new PageInfo<>(warehouseUserEntities); + filterInvLinkDataRequest.setUserName(filterInvLinkDataRequest.getKey()); + List warehouseUserList = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); + filterInvLinkDataRequest.setUserName(null); + filterInvLinkDataRequest.setEmployeeName(filterInvLinkDataRequest.getKey()); + List warehouseUserList1 = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); + PageInfo pageInfo=null; + if(warehouseUserList.size()!=0){ + pageInfo= new PageInfo<>(warehouseUserList); + }else if(warehouseUserList1.size()!=0){ + pageInfo = new PageInfo<>(warehouseUserList1); + }else{ + pageInfo = new PageInfo<>(warehouseUserList); + } + List result = new ArrayList<>(); if (CollUtil.isNotEmpty(pageInfo.getList())) { diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index a397c59ac..97c6e0abf 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.auth; import com.glxp.api.entity.auth.WarehouseUserEntity; +import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.req.auth.FilterInvUserRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -37,6 +38,7 @@ public interface WarehouseUserDao { List selectListByCode(@Param("code") String code); + List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); List selectCodeByUser(@Param("userId") String userId); void deleteByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java index 632ff3d45..e5f0eb935 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java @@ -10,5 +10,9 @@ import lombok.Data; public class FilterInvLinkDataRequest extends ListPageRequest { private String code; + private String key; + private String userName; + private String employeeName; + } diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index a7bdc0d82..2b90a86c4 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -124,7 +124,7 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit(); PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit()); } - return warehouseUserDao.selectListByCode(filterInvLinkDataRequest.getCode()); + return warehouseUserDao.selectListkey(filterInvLinkDataRequest); } @Override diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml index 80d943931..7d2475fb9 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml @@ -252,6 +252,23 @@ where code = #{code} + + - select io_order.*, - bu.name billTypeName, - auth_user.employeeName createUserName, - auth_dept.name deptName, - auth_warehouse.name invName - from io_order - left join basic_bussiness_type bu on io_order.action = bu.action - left join auth_user on auth_user.id = io_order.createUser or auth_user.id = io_order.updateUser - or auth_user.id = io_order.reviewUser - left join auth_dept on auth_dept.code = io_order.deptCode - left join auth_warehouse on auth_warehouse.code = io_order.invCode + select io.*, + (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName, + (select name from auth_dept ad where ad.code = io.deptCode) deptName, + (select name from auth_warehouse aw where aw.code = io.invCode) invName, + (select employeeName from auth_user au where au.id = io.createUser) createUserName, + (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName, + (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName, + (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName, + (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName, + (select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName + from io_order as io - AND io_order.id = #{id} + AND id = #{id} AND billNo like concat('%', #{billNo}, '%') @@ -30,19 +30,20 @@ AND invCode = #{invCode} - AND io_order.createTime between #{startTime} and #{endTime} + AND createTime between #{startTime} and #{endTime} - AND io_order.createTime >= #{startTime} + AND createTime >= #{startTime} - AND io_order.createTime <= #{endTime} + AND createTime <= #{endTime} + - select basic_bustype_pre.* , - basic_bussiness_type.name + select basic_bustype_pre.*, + basic_bussiness_type.name from basic_bustype_pre - left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action - left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code - left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code + left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action + left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code + left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code where basic_bustype_pre.action = #{action} From 25af20da3136615260c20c34b0b9b0fc3fe4df5b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 7 Feb 2023 23:20:01 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/auth/AuthUserController.java | 1 + .../glxp/api/service/auth/impl/InvSpaceServiceImpl.java | 2 +- .../api/service/auth/impl/WarehouseUserServiceImpl.java | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index 666cd5ba7..cc1ae5dbe 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -87,6 +87,7 @@ public class AuthUserController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/admin/auth/admin/selectNotSelectUser") public BaseResponse selectNotSelectUser(FilterInvLinkDataRequest filterInvLinkDataRequest) { + filterInvLinkDataRequest.setKey("1"); List warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); List userIds = new ArrayList<>(); warehouseUserEntities.forEach(user -> { diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java index b1affe0a0..aa3f3c277 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java @@ -46,7 +46,7 @@ public class InvSpaceServiceImpl implements InvSpaceService { @Override public BaseResponse addSpace(InvSpace invSpace) { BaseResponse verifyResult = verifySpaceParams(invSpace); - if (verifyResult.getCode() == 20000) { + if (verifyResult.getCode() != 20000) { return verifyResult; } String result = verifyExist(invSpace); diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index 2b90a86c4..9b00bf59d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -122,7 +122,13 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { } if (filterInvLinkDataRequest.getPage() != null) { int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit()); + if("1".equals(filterInvLinkDataRequest.getKey())){ + + PageHelper.startPage (offset, filterInvLinkDataRequest.getLimit()); + }else{ + PageHelper.offsetPage (offset, filterInvLinkDataRequest.getLimit()); + } + } return warehouseUserDao.selectListkey(filterInvLinkDataRequest); }