From e7392620b6fa108f120cfa119f9033d370d2db72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Mon, 17 Jul 2023 15:29:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9C=AA?= =?UTF-8?q?=E5=90=AF=E7=94=A8=EF=BC=8C=E4=BB=8D=E7=84=B6=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=81=9A=E5=8D=95=EF=BC=88=E7=89=87=E4=BB=94=E7=99=80=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E5=92=8C=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E9=83=BD?= =?UTF-8?q?=E6=9C=89=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/InvBusUserController.java | 20 ++++++++++++++ .../basic/BasicBussinessTypeController.java | 3 ++- .../dao/auth/WarehouseBussinessTypeDao.java | 3 +++ .../api/req/auth/FilterInvBusUserRequest.java | 2 ++ .../auth/WarehouseBussinessTypeService.java | 3 +++ .../WarehouseBussinessTypeServiceImpl.java | 10 +++++++ .../mybatis/mapper/auth/InvBusUserDao.xml | 27 +++++++++++++++++++ .../mapper/auth/WarehouseBussinessTypeDao.xml | 17 ++++++++++++ .../basic/BasicProductCategoryRelMapper.xml | 1 + 9 files changed, 85 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java index ae107aba6..0d625c8bf 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java @@ -61,6 +61,26 @@ public class InvBusUserController { return ResultVOUtils.success(warehouseBussinessTypeEntities); } + @AuthRuleAnnotation("") + @GetMapping("spms/bus/user/selectEnable/filter") + public BaseResponse filterSelectInvUserEnable(FilterInvBusUserRequest filterInvBusUserRequest) { + filterInvBusUserRequest.setEnable("1"); + List responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest); + List warehouseBussinessTypeEntities = + warehouseBussinessTypeService.getListEnableByCode(filterInvBusUserRequest); + + warehouseBussinessTypeEntities.forEach(warehouseBussinessTypeEntity -> + { + for (InvBusUserEntity invBusUserEntity : responses) { + if (invBusUserEntity.getScAction().equals(warehouseBussinessTypeEntity.getAction())) { + warehouseBussinessTypeEntity.setSelect(true); + break; + } + } + }); + return ResultVOUtils.success(warehouseBussinessTypeEntities); + } + //查询用户未关联单据类型 @AuthRuleAnnotation("") diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 324bd4fac..34db52f08 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -80,7 +80,7 @@ public class BasicBussinessTypeController extends BaseController { @GetMapping("/udiwms/busType/findByInvUser") public BaseResponse findByInvUser(FilterBussinessTypeRequest bussinessTypeFilterRequest, BindingResult bindingResult) { - + bussinessTypeFilterRequest.setEnable(true); if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -167,6 +167,7 @@ public class BasicBussinessTypeController extends BaseController { BasicBussinessTypeEntity basicBussinessTypeEntity = new BasicBussinessTypeEntity(); BeanUtil.copyProperties(bussinessTypeSaveRequest, basicBussinessTypeEntity); basicBussinessTypeService.updateBussinessType(basicBussinessTypeEntity); + } else { ResultVOUtils.error(999, "参数错误"); } diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java index c01297e5b..e33347276 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java @@ -3,6 +3,7 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusTypeRequest; +import com.glxp.api.req.auth.FilterInvBusUserRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,6 +33,8 @@ public interface WarehouseBussinessTypeDao extends BaseMapperPlus selectListByCode(@Param("code") String code); + List selectListByCodeEnable(FilterInvBusUserRequest filterInvBusUserRequest); + List filterList(FilterInvBusTypeRequest filterInvBusTypeRequest); boolean deleteByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvBusUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvBusUserRequest.java index 3dd86ca04..827fe13fa 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvBusUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvBusUserRequest.java @@ -12,6 +12,8 @@ public class FilterInvBusUserRequest extends ListPageRequest { private String userId; private String subInvCode; private String scAction; + private String enable; + private String code; private List selectedCodes; } diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java b/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java index 0ee6e363b..475d9d26f 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java @@ -4,6 +4,7 @@ package com.glxp.api.service.auth; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusTypeRequest; +import com.glxp.api.req.auth.FilterInvBusUserRequest; import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.res.basic.BasicBussinessTypeResponse; @@ -20,6 +21,8 @@ public interface WarehouseBussinessTypeService extends IService getListByCode(String code); + List getListEnableByCode(FilterInvBusUserRequest filterInvBusUserRequest); + List filterList(FilterInvBusTypeRequest filterInvBusTypeRequest); /** diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java index 3a7ad4681..edd295bba 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java @@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.WarehouseBussinessTypeDao; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusTypeRequest; +import com.glxp.api.req.auth.FilterInvBusUserRequest; import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.res.basic.BasicBussinessTypeResponse; import com.glxp.api.service.auth.WarehouseBussinessTypeService; @@ -41,6 +42,15 @@ public class WarehouseBussinessTypeServiceImpl extends ServiceImpl getListEnableByCode(FilterInvBusUserRequest filterInvBusUserRequest) { + List warehouseBussinessTypeEntities = warehouseBussinessTypeDao.selectListByCodeEnable(filterInvBusUserRequest); + if (CollUtil.isEmpty(warehouseBussinessTypeEntities)) { + return Collections.emptyList(); + } + return warehouseBussinessTypeEntities; + } + @Override public List filterList(FilterInvBusTypeRequest filterInvBusTypeRequest) { if (filterInvBusTypeRequest == null) { diff --git a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml index 56e9d9414..8c3b964a9 100644 --- a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml @@ -25,6 +25,33 @@ + + + +