diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index fdf93fb..da1119f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -43,12 +43,7 @@ public class MaTypeController extends BaseController { return AjaxResult.success(maTypeList); } - @ApiOperation(value = "查询全部库管员信息") - @GetMapping("/getMaTypeKeeper") - public AjaxResult getMaTypeKeeper(){ - List maTypeList = iTypeService.getMaTypeKeeper(); - return AjaxResult.success(maTypeList); - } + /** * 工机具类型下拉树 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java index df5aa0f..b840e09 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java @@ -1,15 +1,19 @@ package com.bonus.sgzb.base.controller; +import com.bonus.sgzb.base.domain.MaKeeperUser; import com.bonus.sgzb.base.service.IMaTypeKeeperService; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 库管员配置ma_type_keeper(MaTypeKeeper)表控制层 * @@ -52,5 +56,11 @@ public class MaTypeKeeperController extends BaseController { return getDataTable(maTypeKeeperService.getListByMaType(userId, typeName)); } + @ApiOperation(value = "查询全部库管员信息") + @GetMapping("/getMaTypeKeeper") + public AjaxResult getMaTypeKeeper(){ + List maTypeList = maTypeKeeperService.getMaTypeKeeper(); + return AjaxResult.success(maTypeList); + } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeKeeperMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeKeeperMapper.java index a88eb24..16f6923 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeKeeperMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeKeeperMapper.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.base.mapper; +import com.bonus.sgzb.base.domain.MaKeeperUser; import com.bonus.sgzb.base.vo.DeptUser; import com.bonus.sgzb.base.vo.MaTypeKeeperVO; import org.apache.ibatis.annotations.Mapper; @@ -29,5 +30,11 @@ public interface MaTypeKeeperMapper { * @return */ List selectListByUserId(Long userId, String typeName); + + /** + * 查询全部库管员信息 + * @return + */ + List getMaTypeKeeper(); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java index 2a9e94b..4cd5aed 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java @@ -88,9 +88,5 @@ public interface MaTypeMapper { List selectMaTypeByUserId(Long userId); - /** - * 查询全部库管员信息 - * @return - */ - List getMaTypeKeeper(); + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/IMaTypeKeeperService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/IMaTypeKeeperService.java index a6d6dea..46e769e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/IMaTypeKeeperService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/IMaTypeKeeperService.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.base.service; +import com.bonus.sgzb.base.domain.MaKeeperUser; import com.bonus.sgzb.base.vo.DeptUser; import com.bonus.sgzb.base.vo.MaTypeKeeperVO; @@ -27,5 +28,11 @@ public interface IMaTypeKeeperService { * @return */ List getListByMaType(Long userId, String typeName); + + /** + * 查询全部库管员信息 + * @return + */ + List getMaTypeKeeper(); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/ITypeService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/ITypeService.java index fe643bf..c1cbb7d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/ITypeService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/ITypeService.java @@ -70,9 +70,5 @@ public interface ITypeService { List getEquipmentType(Long typeId, String typeName); - /** - * 查询全部库管员信息 - * @return - */ - List getMaTypeKeeper(); + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeKeeperServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeKeeperServiceImpl.java index b40828c..3797f00 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeKeeperServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeKeeperServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.base.service.impl; +import com.bonus.sgzb.base.domain.MaKeeperUser; import com.bonus.sgzb.base.mapper.MaTypeKeeperMapper; import com.bonus.sgzb.base.service.IMaTypeKeeperService; import com.bonus.sgzb.base.vo.DeptUser; @@ -43,5 +44,14 @@ public class MaTypeKeeperServiceImpl implements IMaTypeKeeperService { return maTypeKeeperMapper.selectListByUserId(userId, typeName); } + + /** + * 查询全部库管员信息 + * @return + */ + @Override + public List getMaTypeKeeper() { + return maTypeKeeperMapper.getMaTypeKeeper(); + } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java index 924bce0..45142d0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java @@ -341,14 +341,6 @@ public class MaTypeServiceImpl implements ITypeService { return list; } - /** - * 查询全部库管员信息 - * @return - */ - @Override - public List getMaTypeKeeper() { - return maTypeMapper.getMaTypeKeeper(); - } /** * @Author dingjie * @Date 2023/12/14 diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml index 4a6dd59..70f5220 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -422,15 +422,4 @@ update ma_type set num = IFNULL( num, 0 ) + 1 where type_id = #{typeId} - \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeKeeperMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeKeeperMapper.xml index 57973bc..3a1ea30 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeKeeperMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeKeeperMapper.xml @@ -26,4 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user su on mtk.user_id = su.user_id + \ No newline at end of file