From a4838a4459e0dcbd42215e8852a38ef70c3efcc8 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 13:57:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=80=89=E5=85=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7=EF=BC=8C=E7=A7=BB=E9=99=A4=E7=94=A8=E6=88=B7=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=B9=81=E5=BF=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 2 +- .../glxp/api/dao/auth/WarehouseUserDao.java | 7 ++--- .../api/req/auth/FilterInvUserRequest.java | 2 +- .../service/auth/WarehouseUserService.java | 8 ++++-- .../auth/impl/WarehouseUserServiceImpl.java | 10 ++++--- .../mybatis/mapper/auth/WarehouseUserDao.xml | 28 ++++--------------- src/main/resources/schemas/schema_v2.1.sql | 5 ++++ 7 files changed, 27 insertions(+), 35 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 4d983b6cd..dad64d2ad 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -612,7 +612,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/delWarehouseUser") - public BaseResponse deleteWarehouseUser(Integer id) { + public BaseResponse deleteWarehouseUser(Long id) { if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id); 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 43cefff33..109b703e8 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -10,8 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface WarehouseUserDao extends BaseMapperPlus { - int deleteByPrimaryKey(Integer id); +public interface WarehouseUserDao extends BaseMapperPlus { int deleteByCodeAndId(@Param("id") Long id, @Param("code") String code); @@ -35,13 +34,13 @@ public interface WarehouseUserDao extends BaseMapperPlus list); - int batchInsert(@Param("list") List list); List selectListByCode(@Param("code") String code); List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds")List userIds ); + List selectNotSelectUserid(@Param("userIds") List userIds); + List selectCodeByUser(@Param("userId") String userId); void deleteByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java index d231ad607..6fcb8d963 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java @@ -6,7 +6,7 @@ import lombok.Data; @Data public class FilterInvUserRequest extends ListPageRequest { - private Integer id; + private Long id; private String code; private Long userid; private String username; diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index 476f5a36b..248c6c2e2 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java @@ -18,7 +18,7 @@ public interface WarehouseUserService extends IService { * @return */ - WarehouseUserEntity selectById(Integer id); + WarehouseUserEntity selectById(Long id); List getListByCode(String code); @@ -48,7 +48,7 @@ public interface WarehouseUserService extends IService { * * @param id */ - void deleteWarehouseUser(Integer id); + void deleteWarehouseUser(Long id); void deleteByCodeAndId(Long id, String code); @@ -61,7 +61,8 @@ public interface WarehouseUserService extends IService { * @return */ List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds")List userIds ); + + List selectNotSelectUserid(@Param("userIds") List userIds); /** * 根据分仓编码，统计用户数量 @@ -70,5 +71,6 @@ public interface WarehouseUserService extends IService { * @return */ Integer countUserBySubInvCode(String subInvCode); + boolean insert(WarehouseUserEntity warehouseUserEntity); } 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 ab5966e5f..55ef0342e 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 @@ -1,6 +1,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.WarehouseUserDao; @@ -28,7 +29,7 @@ public class WarehouseUserServiceImpl extends ServiceImpl warehouseUserEntities = warehouseUserDao.filterList(filterInvUserRequest); @@ -75,9 +76,10 @@ public class WarehouseUserServiceImpl extends ServiceImpl - - - delete - from auth_warehouse_user - where id = #{id,jdbcType=INTEGER} - delete @@ -101,7 +95,7 @@ isDirector = #{isDirector} - where id = #{id,jdbcType=INTEGER} + where id = #{id,jdbcType=INTEGER} @@ -167,16 +161,6 @@ #{item.id,jdbcType=INTEGER} - - - insert into auth_warehouse_user - (code, userId, userName, isDirector) - values - - (#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR}, - #{item.isDirector}) - - @@ -205,9 +189,9 @@ id = #{id,jdbcType=INTEGER}, - code = #{code,jdbcType=VARCHAR}, - userId = #{userid,jdbcType=BIGINT}, - userName = #{username,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR}, + userId = #{userid,jdbcType=BIGINT}, + userName = #{username,jdbcType=VARCHAR}, select auth_warehouse_user.*, auth_user.employeeName from auth_warehouse_user - inner join auth_user on auth_user.id = auth_warehouse_user.userId + inner join auth_user on auth_user.id = auth_warehouse_user.userId where code = #{code} @@ -271,7 +255,7 @@ parameterType="com.glxp.api.req.auth.FilterInvLinkDataRequest"> select auth_warehouse_user.*, auth_user.employeeName from auth_warehouse_user - inner join auth_user on auth_user.id = auth_warehouse_user.userId + inner join auth_user on auth_user.id = auth_warehouse_user.userId AND code = #{code} diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 6e57cb659..c010b2601 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -382,3 +382,8 @@ CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2); + + + +CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);