diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/retired/user/controller/RetiredListController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/retired/user/controller/RetiredListController.java index b16ae29..a9ef954 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/retired/user/controller/RetiredListController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/retired/user/controller/RetiredListController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.staffmanage.retired.user.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.zhgh.staffmanage.retired.group.service.RetiredGroupService; @@ -36,8 +37,14 @@ public class RetiredListController { public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffmanage/retired/list/index.html") + @SaCheckPermission("h5.retired.list") + public void h5Index() { + } + @At - @SaCheckPermission("retired.list") + @SaCheckPermission(value = {"retired.list", "h5.retired.list"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param("unitId") String unitId, @Param("unionId") String unionId, @@ -48,34 +55,34 @@ public class RetiredListController { @At @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("retired.list") + @SaCheckPermission(value = {"retired.list", "h5.retired.list"}, mode = SaMode.OR) public Result changeToDie(String userId, Date deathDate) { retiredUserService.changeToDie(userId, deathDate); return Result.success(); } @At - @SaCheckPermission("retired.list") + @SaCheckPermission(value = {"retired.list", "h5.retired.list"}, mode = SaMode.OR) public Result nonRetiredUserPageData(PageForm pageForm) { return Result.success(retiredUserService.nonRetiredUserPageData(pageForm)); } @At @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("retired.list") + @SaCheckPermission(value = {"retired.list", "h5.retired.list"}, mode = SaMode.OR) public Result doBatchJoinRetire(@Param("userIds") String[] userIds) { retiredUserService.batchJoinRetire(userIds); return Result.success(); } @At - @SaCheckPermission("retired.list") + @SaCheckPermission(value = {"retired.list", "h5.retired.list"}, mode = SaMode.OR) public Result retiredGroup() { return Result.success(retiredGroupService.options()); } @At - @SaCheckPermission("retired.list") + @SaCheckPermission(value = {"retired.list", "h5.retired.list"}, mode = SaMode.OR) public Result retiredPartyBranch() { return Result.success(retiredPartyBranchService.options()); } @@ -88,28 +95,28 @@ public class RetiredListController { } @At - @SaCheckPermission("retired.list") + @SaCheckPermission(value = {"retired.list", "h5.retired.list"}, mode = SaMode.OR) public Result userInfo(String userId) { return Result.success(retiredUserService.userInfo(userId)); } @At @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("retired.list") + @SaCheckPermission(value = {"retired.list", "h5.retired.list"}, mode = SaMode.OR) public Result doSubmit(@Param("user") String user, @Param("userId") String userId) { retiredUserService.submit(user, userId); return Result.success(); } @At - @SaCheckPermission("retired.list") + @SaCheckPermission(value = {"retired.list", "h5.retired.list"}, mode = SaMode.OR) public Result getInfo(String id) { return Result.success(retiredUserService.getInfo(id)); } @At @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("retired.list") + @SaCheckPermission(value = {"retired.list", "h5.retired.list"}, mode = SaMode.OR) public Result doDelete(String id) { retiredUserService.deleteRetired(id); return Result.success(); diff --git a/src/main/resources/db/retired/init_retired_list_h5.sql b/src/main/resources/db/retired/init_retired_list_h5.sql new file mode 100644 index 0000000..00e79cf --- /dev/null +++ b/src/main/resources/db/retired/init_retired_list_h5.sql @@ -0,0 +1,18 @@ +-- 离退休人员档案手机端初始化脚本 +-- 说明:PC端离退休人员档案已部署时,只需要执行本脚本新增手机端入口和权限,菜单挂载到H5端已有的人员管理模块。 + +SET @now := CAST(UNIX_TIMESTAMP(NOW()) * 1000 AS UNSIGNED); + +INSERT INTO `sys_menu` (`id`, `parentId`, `path`, `name`, `initialPinyinName`, `aliasName`, `type`, `href`, `target`, `icon`, `picIcon`, `showit`, `disabled`, `permission`, `note`, `location`, `hasChildren`, `createdBy`, `createdAt`, `updatedBy`, `updatedAt`, `delFlag`, `platform`, `moduleId`, `isRecommendApp`, `isRecommendService`) +SELECT 'b1f00006000000000000000000000003', '', 'H9913', '离退休人员档案', 'L', NULL, 'menu', '/platform/retired/list/h5', 'data-pjax', 'manager-o', NULL, 1, 0, 'h5.retired.list', NULL, 9913, 0, '', @now, '', @now, 0, 'H5', module.`id`, 0, 0 +FROM `sys_module` module +WHERE module.`platform` = 'H5' + AND module.`name` = '人员管理' + AND NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `permission` = 'h5.retired.list' OR `path` = 'H9913'); + +INSERT INTO `sys_role_menu` (`roleId`, `menuId`) +SELECT r.`id`, m.`id` +FROM `sys_role` r +JOIN `sys_menu` m ON m.`permission` = 'h5.retired.list' +WHERE r.`code` IN ('SYSADMIN', 'SCHOOL_UNION_ADMIN') + AND NOT EXISTS (SELECT 1 FROM `sys_role_menu` rm WHERE rm.`roleId` = r.`id` AND rm.`menuId` = m.`id`); diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/retired/list/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/retired/list/index.html new file mode 100644 index 0000000..deed57c --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffmanage/retired/list/index.html @@ -0,0 +1,390 @@ + +
+ + + + + + +
+ 新增退休人员 + 设置退休人员 +
+
+ + + + + + + +
+ + {{emptyText(viewData.loginname)}} + {{emptyText(viewData.username)}} + {{emptyText(viewData.sex)}} + {{formatDate(viewData.birthday) || '暂无'}} + {{emptyText(viewData.idCard)}} + {{emptyText(viewData.political)}} + {{emptyText(viewData.nativePlace)}} + {{emptyText(viewData.mobile)}} + {{emptyText(viewData.arrivalAtSchoolDate)}} + {{workAgeText(viewData.arrivalAtSchoolDate) || '暂无'}} + {{formatDate(viewData.retireDate) || '暂无'}} + {{emptyText(viewData.position)}} + {{emptyText(viewData.professionalTitle)}} + {{emptyText(viewData.userState)}} + {{emptyText(viewData.personType)}} + {{emptyText(viewData.unionName)}} + {{emptyText(viewData.unitName)}} + {{emptyText(viewData.retiredGroupName)}} + {{emptyText(viewData.retiredPartyBranchName)}} + +
+
+ + + + + + + + + + + + + + + + + + + + + +
+ 取消 + 确定 +
+
+ + + + + + + + + + + +
+ 上一页 + 第{{nonRetiredUserPageForm.pageNumber}}页 / 共{{nonRetiredUserPageForm.totalCount}}人 + 下一页 +
+
+ 取消 + 确定 +
+
+ + + + + + + + + + + + + +
+ + + +