diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeKeeperController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeKeeperController.java index 1080cdf9..7b3b00e5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeKeeperController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeKeeperController.java @@ -97,15 +97,28 @@ public class TypeKeeperController extends BaseController { } /** - * 删除库管员配置 + * 批量删除库管员配置 */ - @ApiOperation(value = "删除库管员配置") + @ApiOperation(value = "批量删除库管员配置") @PreventRepeatSubmit @RequiresPermissions("ma:keeper:remove") - @SysLog(title = "库管员配置", businessType = OperaType.DELETE, module = "物资管理->删除库管员配置") + @SysLog(title = "库管员配置", businessType = OperaType.DELETE, module = "物资管理->批量删除库管员配置") @DeleteMapping("/{IDs}") public AjaxResult remove(@PathVariable Long[] IDs) { return toAjax(typeKeeperService.deleteTypeKeeperByIDs(IDs)); } + + /** + * 删除单个库管员配置 + */ + @ApiOperation(value = "删除单个库管员配置") + @PreventRepeatSubmit + @RequiresPermissions("ma:keeper:remove") + @SysLog(title = "库管员配置", businessType = OperaType.DELETE, logType = 1,module = "物资管理->删除单个库管员配置") + @DeleteMapping + public AjaxResult remove(@RequestBody TypeKeeper typeKeeper) + { + return toAjax(typeKeeperService.deleteTypeKeeperByUserIdAndTypeId(typeKeeper)); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeRepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeRepairController.java index 024021af..fb6286d2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeRepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeRepairController.java @@ -104,15 +104,28 @@ public class TypeRepairController extends BaseController } /** - * 删除维修班机具配置 + * 批量删除维修班机具配置 */ - @ApiOperation(value = "删除维修班机具配置") + @ApiOperation(value = "批量删除维修班机具配置") @PreventRepeatSubmit @RequiresPermissions("ma:repair:remove") - @SysLog(title = "维修班机具配置", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除维修班机具配置") + @SysLog(title = "维修班机具配置", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->批量删除维修班机具配置") @DeleteMapping("/{IDs}") public AjaxResult remove(@PathVariable Long[] IDs) { return toAjax(typeRepairService.deleteTypeRepairByIDs(IDs)); } + + /** + * 删除单个维修班机具配置 + */ + @ApiOperation(value = "删除单个维修班机具配置") + @PreventRepeatSubmit + @RequiresPermissions("ma:repair:remove") + @SysLog(title = "维修班机具配置", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除单个维修班机具配置") + @DeleteMapping + public AjaxResult remove(@RequestBody TypeRepair typeRepair) + { + return toAjax(typeRepairService.deleteTypeRepairByUserIdAndTypeId(typeRepair)); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeRepairService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeRepairService.java index 442c3708..8c7382da 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeRepairService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeRepairService.java @@ -55,11 +55,6 @@ public interface ITypeRepairService { */ public int deleteTypeRepairByIDs(Long[] IDs); - /** - * 根据用户id和类型id删除配置信息 - */ - int deleteTypeRepairByUserIdAndTypeId(TypeRepair typeRepair); - /** * 删除维修班机具配置信息 * @@ -67,4 +62,9 @@ public interface ITypeRepairService { * @return 结果 */ public int deleteTypeRepairByID(Long ID); + + /** + * 根据用户id和类型id删除配置信息 + */ + int deleteTypeRepairByUserIdAndTypeId(TypeRepair typeRepair); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeRepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeRepairServiceImpl.java index 4597b8da..be717e8a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeRepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeRepairServiceImpl.java @@ -92,16 +92,6 @@ public class TypeRepairServiceImpl implements ITypeRepairService { return typeRepairMapper.deleteTypeRepairByIDs(IDs); } - /** - * 根据用户id和类型id删除配置信息 - * - * @param typeRepair - */ - @Override - public int deleteTypeRepairByUserIdAndTypeId(TypeRepair typeRepair) { - return typeRepairMapper.deleteTypeRepairByUserIdAndTypeId(typeRepair); - } - /** * 删除维修班机具配置信息 * @@ -113,4 +103,14 @@ public class TypeRepairServiceImpl implements ITypeRepairService { { return typeRepairMapper.deleteTypeRepairByID(ID); } + + /** + * 根据用户id和类型id删除配置信息 + * + * @param typeRepair + */ + @Override + public int deleteTypeRepairByUserIdAndTypeId(TypeRepair typeRepair) { + return typeRepairMapper.deleteTypeRepairByUserIdAndTypeId(typeRepair); + } }