From 51689e4e0bdb0c1a97aa0ed90d9a5787667725eb Mon Sep 17 00:00:00 2001 From: dd3s_206 Date: Fri, 12 Jun 2026 13:43:03 +0800 Subject: [PATCH] =?UTF-8?q?30=E6=95=99=E9=BE=84=E6=95=99=E8=81=8C=E5=B7=A5?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=92=8C=E5=8D=95=E8=BA=AB=E6=95=99=E5=B7=A5?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E6=89=8B=E6=9C=BAh5?= =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E8=AF=A2=E9=A1=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SingleTeacherLedgerController.java | 19 +- .../controller/ThirtyTeachController.java | 13 +- .../singleTeacher/init_single_teacher_h5.sql | 23 ++ .../db/thirtyTeach/init_thirty_teach_h5.sql | 23 ++ .../singleTeacher/ledger/index.html | 286 ++++++++++++++++++ .../staffmanage/thirtyTeach/manage/index.html | 196 ++++++++++++ 6 files changed, 551 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/db/singleTeacher/init_single_teacher_h5.sql create mode 100644 src/main/resources/db/thirtyTeach/init_thirty_teach_h5.sql create mode 100644 src/main/resources/views/platform/zhghh5/staffmanage/singleTeacher/ledger/index.html create mode 100644 src/main/resources/views/platform/zhghh5/staffmanage/thirtyTeach/manage/index.html diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherLedgerController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherLedgerController.java index de192f0..c5eb156 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherLedgerController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherLedgerController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.staffmanage.singleTeacher.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; @@ -38,8 +39,14 @@ public class SingleTeacherLedgerController { public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffmanage/singleTeacher/ledger/index.html") + @SaCheckPermission("h5.singleTeacher.ledger") + public void h5Index() { + } + @At - @SaCheckPermission("singleTeacher.ledger") + @SaCheckPermission(value = {"singleTeacher.ledger", "h5.singleTeacher.ledger"}, mode = SaMode.OR) @ApiOperation("分页查询") @Ok("json:{dateFormat:'yyyy-MM-dd'}") public Result pageData(@Param("pageForm") SingleTeacherPageForm pageForm) { @@ -48,7 +55,7 @@ public class SingleTeacherLedgerController { } @At - @SaCheckPermission("singleTeacher.ledger") + @SaCheckPermission(value = {"singleTeacher.ledger", "h5.singleTeacher.ledger"}, mode = SaMode.OR) @ApiOperation("新增") @SLog(tag = "单身教工台账", msg = "新增了一条记录,用户ID:${args[0].userId}") public Result insert(@Param("singleTeacher") SingleTeacher singleTeacher) { @@ -57,7 +64,7 @@ public class SingleTeacherLedgerController { } @At - @SaCheckPermission("singleTeacher.ledger") + @SaCheckPermission(value = {"singleTeacher.ledger", "h5.singleTeacher.ledger"}, mode = SaMode.OR) @ApiOperation("编辑") @SLog(tag = "单身教工台账", msg = "编辑了一条记录,用户ID:${args[0].userId}") public Result update(@Param("singleTeacher") SingleTeacher singleTeacher) { @@ -66,7 +73,7 @@ public class SingleTeacherLedgerController { } @At - @SaCheckPermission("singleTeacher.ledger") + @SaCheckPermission(value = {"singleTeacher.ledger", "h5.singleTeacher.ledger"}, mode = SaMode.OR) @ApiOperation("删除") @SLog(tag = "单身教工台账", msg = "删除了一条记录,用户ID:${args[0].userId}") public Result delete(@Param("id") String id) { @@ -75,7 +82,7 @@ public class SingleTeacherLedgerController { } @At - @SaCheckPermission("singleTeacher.ledger") + @SaCheckPermission(value = {"singleTeacher.ledger", "h5.singleTeacher.ledger"}, mode = SaMode.OR) @ApiOperation("详情") public Result detail(@Param("id") String id) { SingleTeacher singleTeacher = dao.fetch(SingleTeacher.class, id); @@ -83,7 +90,7 @@ public class SingleTeacherLedgerController { } @At - @SaCheckPermission("singleTeacher.ledger") + @SaCheckPermission(value = {"singleTeacher.ledger", "h5.singleTeacher.ledger"}, mode = SaMode.OR) @ApiOperation("查询非单身教工人员") public Result queryNotSingleTeacher(@Param("key") String key) { Sql sql = Sqls.create("select id,username,loginname,mobile,education,birthday from sys_user $condition"); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java index 7d176c1..1e351c7 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.excel.EasyExcel; @@ -70,9 +71,15 @@ public class ThirtyTeachController { public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffmanage/thirtyTeach/manage/index.html") + @SaCheckPermission("h5.thirtyTeach.manage") + public void h5Index() { + } + @At @ApiOperation("分页查询") - @SaCheckPermission("thirtyTeach.manage") + @SaCheckPermission(value = {"thirtyTeach.manage", "h5.thirtyTeach.manage"}, mode = SaMode.OR) public Result pageData(ThirtyTeachPageForm pageForm) { Sql sql = thirtyTeachService.getSql(pageForm); Pagination pagination = thirtyTeachService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); @@ -98,7 +105,7 @@ public class ThirtyTeachController { @At @ApiOperation("批量删除三十龄教工") - @SaCheckPermission("thirtyTeach.manage") + @SaCheckPermission(value = {"thirtyTeach.manage", "h5.thirtyTeach.manage"}, mode = SaMode.OR) @SLog(type = "30龄教工-教职工管理", tag = "批量删除三十龄教工",msg = "批量删除三十龄教工${args[0]}") public Result doBatchDelete(@Param("userIds") String[] userIds) { List userIdList = Arrays.asList(userIds); @@ -156,7 +163,7 @@ public class ThirtyTeachController { @At @ApiOperation("修改荣誉证办理年月") - @SaCheckPermission("thirtyTeach.manage") + @SaCheckPermission(value = {"thirtyTeach.manage", "h5.thirtyTeach.manage"}, mode = SaMode.OR) public Result doEditThirtyCertificateProcessingTime(String id,String thirtyCertificateProcessingTime){ sysUserService.update(Chain.make("thirtyCertificateProcessingTime", thirtyCertificateProcessingTime), Cnd.where("id", "=", id)); return Result.success(); diff --git a/src/main/resources/db/singleTeacher/init_single_teacher_h5.sql b/src/main/resources/db/singleTeacher/init_single_teacher_h5.sql new file mode 100644 index 0000000..edd231b --- /dev/null +++ b/src/main/resources/db/singleTeacher/init_single_teacher_h5.sql @@ -0,0 +1,23 @@ +-- 单身教职工管理手机端初始化脚本 +-- 说明:PC端单身教职工管理已部署时,只需要执行本脚本新增手机端入口和权限。 + +SET @now := CAST(UNIX_TIMESTAMP(NOW()) * 1000 AS UNSIGNED); + +INSERT INTO `sys_module` (`id`, `platform`, `name`, `icon`, `faIcon`, `sortNum`, `createdBy`, `createdAt`, `updatedBy`, `updatedAt`, `delFlag`) +SELECT 'b1f00005000000000000000000000001', 'H5', '教职工管理', NULL, 'ti-user', 9902, '', @now, '', @now, 0 +FROM DUAL +WHERE NOT EXISTS (SELECT 1 FROM `sys_module` WHERE `id` = 'b1f00005000000000000000000000001' OR (`platform` = 'H5' AND `name` = '教职工管理')); + +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 'b1f00006000000000000000000000001', '', 'H9911', '单身教职工管理', 'D', null, 'menu', '/platform/singleTeacher/ledger/h5', 'data-pjax', 'friends-o', NULL, 1, 0, 'h5.singleTeacher.ledger', NULL, 9911, 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.singleTeacher.ledger' OR `path` = 'H9911'); + +INSERT INTO `sys_role_menu` (`roleId`, `menuId`) +SELECT r.`id`, m.`id` +FROM `sys_role` r +JOIN `sys_menu` m ON m.`permission` = 'h5.singleTeacher.ledger' +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/db/thirtyTeach/init_thirty_teach_h5.sql b/src/main/resources/db/thirtyTeach/init_thirty_teach_h5.sql new file mode 100644 index 0000000..a9f3bf7 --- /dev/null +++ b/src/main/resources/db/thirtyTeach/init_thirty_teach_h5.sql @@ -0,0 +1,23 @@ +-- 30教龄教职工管理手机端初始化脚本 +-- 说明:PC端30教龄教职工管理已部署时,只需要执行本脚本新增手机端入口和权限。 + +SET @now := CAST(UNIX_TIMESTAMP(NOW()) * 1000 AS UNSIGNED); + +INSERT INTO `sys_module` (`id`, `platform`, `name`, `icon`, `faIcon`, `sortNum`, `createdBy`, `createdAt`, `updatedBy`, `updatedAt`, `delFlag`) +SELECT 'b1f00005000000000000000000000001', 'H5', '教职工管理', NULL, 'ti-user', 9902, '', @now, '', @now, 0 +FROM DUAL +WHERE NOT EXISTS (SELECT 1 FROM `sys_module` WHERE `id` = 'b1f00005000000000000000000000001' OR (`platform` = 'H5' AND `name` = '教职工管理')); + +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 'b1f00006000000000000000000000002', '', 'H9912', '30教龄教职工管理', 'S', null, 'menu', '/platform/thirtyTeach/manage/h5', 'data-pjax', 'medal-o', NULL, 1, 0, 'h5.thirtyTeach.manage', NULL, 9912, 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.thirtyTeach.manage' OR `path` = 'H9912'); + +INSERT INTO `sys_role_menu` (`roleId`, `menuId`) +SELECT r.`id`, m.`id` +FROM `sys_role` r +JOIN `sys_menu` m ON m.`permission` = 'h5.thirtyTeach.manage' +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/singleTeacher/ledger/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/singleTeacher/ledger/index.html new file mode 100644 index 0000000..b4fa8b0 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffmanage/singleTeacher/ledger/index.html @@ -0,0 +1,286 @@ + +
+ + + + + + + + + + + + + + + + + + +
+ + {{viewData.username || '暂无'}} + {{viewData.loginname || '暂无'}} + {{viewData.sex || '暂无'}} + {{viewData.mobile || '暂无'}} + {{formatDate(viewData.birthday) || '暂无'}} + {{viewData.education || '暂无'}} + {{viewData.maritalStatus || '暂无'}} + {{viewData.unionName || '暂无'}} + {{viewData.unitName || '暂无'}} + {{viewData.height || '暂无'}} + {{viewData.nativePlace || '暂无'}} + {{viewData.monthlyIncome || '暂无'}} + {{viewData.housingSituation || '暂无'}} + {{viewData.hobby || '暂无'}} + {{viewData.intentionFriends || '暂无'}} + {{viewData.introduction || '暂无'}} + + + 暂无 + + +
+
+ + + + + + + + + + + + + + + + + + + + +
+ 取消 + 确定 +
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/thirtyTeach/manage/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/thirtyTeach/manage/index.html new file mode 100644 index 0000000..3558b48 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffmanage/thirtyTeach/manage/index.html @@ -0,0 +1,196 @@ + +
+ + + + + + + + + + + + + + + + + + +
+ + {{viewData.username || '暂无'}} + {{viewData.loginname || '暂无'}} + {{viewData.sex || '暂无'}} + {{viewData.member == 1 ? '是' : '否'}} + {{viewData.mobile || '暂无'}} + {{formatDate(viewData.birthday) || '暂无'}} + {{viewData.teachNum ? viewData.teachNum + '年' : '暂无'}} + {{viewData.personType || '暂无'}} + {{viewData.userState || '暂无'}} + {{viewData.unionName || '暂无'}} + {{viewData.unitName || '暂无'}} + {{viewData.thirtyCertificateProcessingTime || '暂无'}} + +
+
+ + + + + + + +
+ 取消 + 确定 +
+
+ + + + +
+ + + +