diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java index 085a3694..f6c1fb01 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java @@ -106,6 +106,61 @@ public class DepartmentController extends ControllerBase { } + /** + * 启用 + * @param ids + * @return + */ + @PostMapping("enable") + @MethodInfoMark(value = "启用",menuName = "部门管理") + @ApiMark(moduleName = "部门管理", apiName = "启用") + public ApiResult enable(@RequestBody List ids ){ + VUtils.trueThrowBusinessError(CollUtil.isEmpty(ids)).throwMessage("请选择要启用的数据"); + List tBaseDepartments = departmentService.getBaseMapper().selectByIds(ids); + tBaseDepartments.forEach(u->{ + u.setDeptStatus(1); + u.setDataModifyUserNo(AdminUserUtil.getUserNo()); + u.setDataModifyUserName(AdminUserUtil.getUserName()); + u.setDataModifyTime(LocalDateTime.now()); + }); + if(CollUtil.isNotEmpty(tBaseDepartments)){ + departmentService.updateBatchById(tBaseDepartments); + } + + return ApiResult.success(true); + } + + + /** + * 禁用 + * @param ids + * @return + */ + @PostMapping("disable") + @MethodInfoMark(value = "禁用",menuName = "部门管理") + @ApiMark(moduleName = "部门管理", apiName = "禁用") + public ApiResult disable(@RequestBody List ids ){ + VUtils.trueThrowBusinessError(CollUtil.isEmpty(ids)).throwMessage("请选择要启用的数据"); + List tBaseDepartments = departmentService.getBaseMapper().selectByIds(ids); + tBaseDepartments.forEach(u->{ + u.setDeptStatus(0); + u.setDataModifyUserNo(AdminUserUtil.getUserNo()); + u.setDataModifyUserName(AdminUserUtil.getUserName()); + u.setDataModifyTime(LocalDateTime.now()); + }); + if(CollUtil.isNotEmpty(tBaseDepartments)){ + departmentService.updateBatchById(tBaseDepartments); + } + + return ApiResult.success(true); + } + + + + + + + } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DepartmentQuery.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DepartmentQuery.java index d31cba01..7492fee8 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DepartmentQuery.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DepartmentQuery.java @@ -11,6 +11,6 @@ public class DepartmentQuery extends PageBaseQuery { //编码OR 名称 private String deptCodeOrName; - //是否有效 0-否 1-是 - private Integer dataValidStatus; + // 状态 0-禁用 1-启用 + private Integer deptStatus; } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java index 9275c76d..1587b740 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java @@ -46,10 +46,15 @@ public class TBaseDepartment implements Serializable { */ private Integer deptParentId; + /** + * 状态 0-禁用 1-启用 + */ + private Integer deptStatus; + /** * 有效状态 0否1是 */ - private Byte dataValidStatus; + private Integer dataValidStatus; /** * 创建人编号 diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml index 95889129..7d4b4373 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml @@ -5,8 +5,8 @@ and (dept_code=#{query.deptCodeOrName} or dept_name=#{query.deptCodeOrName}) - - and data_valid_status=#{query.dataValidStatus} + + and dept_status=#{query.deptStatus}