From af765b180f89025c7c646d33c607ce1969da4763 Mon Sep 17 00:00:00 2001 From: Paidax Date: Thu, 11 Sep 2025 09:22:37 +0800 Subject: [PATCH] commit --- ...berApplyBranchUnionApprovalController.java | 1 + ...berApplySchoolUnionApprovalController.java | 1 + .../info/MemberInfoBoardController.java | 17 ++- .../info/MemberInfoGroupController.java | 18 ++- .../MemberModelWorkerController.java | 91 ------------ .../MemberComprehensiveController.java | 6 - .../components/plugins/h5/TableList.vue | 1 + .../member/common/info/memberInfo.js | 47 +++--- .../sourcechange/manage/index.html | 140 +++++++++--------- .../schoolunionapproval/index.html | 6 +- .../apply/branchunionapproval/index.html | 31 ++-- .../staffmanage/member/apply/mine/index.html | 6 +- .../apply/schoolunionapproval/index.html | 18 +-- .../member/apply/submit/index.html | 96 +++++------- .../member/{ => info}/board/index.html | 0 .../staffmanage/member/info/group/index.html | 138 +++++++++++++++++ .../staffmanage/member/query/index.html | 135 ----------------- 17 files changed, 324 insertions(+), 428 deletions(-) delete mode 100644 src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/modelworker/MemberModelWorkerController.java rename src/main/resources/views/platform/zhghh5/staffmanage/member/{ => info}/board/index.html (100%) create mode 100644 src/main/resources/views/platform/zhghh5/staffmanage/member/info/group/index.html delete mode 100644 src/main/resources/views/platform/zhghh5/staffmanage/member/query/index.html diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java index 0f53e888..c7eae14d 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java @@ -92,6 +92,7 @@ public class MemberApplyBranchUnionApprovalController { info.userState, info.preparedBy, info.personType, + info.applyDateTime, info.sign, ins.id AS instanceId, ins.businessNo, diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java index 6006411c..3b2edffa 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java @@ -91,6 +91,7 @@ public class MemberApplySchoolUnionApprovalController { info.preparedBy, info.personType, info.origin, + info.applyDateTime, info.sign, ins.id AS instanceId, ins.businessNo, diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoBoardController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoBoardController.java index 924b12fa..8d7d673d 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoBoardController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoBoardController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.staffmanage.member.controller.info; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.date.DateUtil; import com.budwk.app.base.result.Result; import com.budwk.app.sys.models.Sys_dict; @@ -46,7 +47,7 @@ public class MemberInfoBoardController { } @At - @Ok("beetl:/platform/zhghh5/staffmanage/member/board/index.html") + @Ok("beetl:/platform/zhghh5/staffmanage/member/info/board/index.html") @SaCheckPermission("h5.member.info.board") public void h5() { } @@ -55,7 +56,7 @@ public class MemberInfoBoardController { * @return 今年和去年的会员数 */ @At - @SaCheckPermission("member.info.board") + @SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR) public Result memberNumber() { int memberNum = memberInfoService.count(Sqls.create("select count(1) from sys_user where member = 1")); int lastYearMemberNum = memberInfoService.count(Sqls.create("select count(1) from member_history where year = year(now()) -1 ")); @@ -66,7 +67,7 @@ public class MemberInfoBoardController { * @return 会员增长趋势 */ @At - @SaCheckPermission("member.info.board") + @SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR) public Result growthTrend() { List result = new ArrayList<>(); int year = DateUtil.thisYear(); @@ -83,7 +84,7 @@ public class MemberInfoBoardController { * @return 会员占比 */ @At - @SaCheckPermission("member.info.board") + @SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR) public Result memberPercentage() { List memberApplyPersonTypeDictList = sysDictService.getSubListByCode("PERSON_TYPE"); List personTypes = memberApplyPersonTypeDictList.stream().map(Sys_dict::getCode).collect(Collectors.toList()); @@ -103,7 +104,7 @@ public class MemberInfoBoardController { * @return 男女占比 */ @At - @SaCheckPermission("member.info.board") + @SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR) public Result memberSexPercentage() { int men = memberInfoService.count(Sqls.create("select count(1) from sys_user where member = 1 and sex = '男' ")); int women = memberInfoService.count(Sqls.create("select count(1) from sys_user where member = 1 and sex = '女' ")); @@ -117,7 +118,7 @@ public class MemberInfoBoardController { * @return */ @At - @SaCheckPermission("member.info.board") + @SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR) public Result unionMember() { String str = """ SELECT @@ -141,7 +142,7 @@ public class MemberInfoBoardController { * @return */ @At - @SaCheckPermission("member.info.board") + @SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR) public Result personTypeMember() { Sql sql = Sqls.create(""" SELECT @@ -166,7 +167,7 @@ public class MemberInfoBoardController { * @return */ @At - @SaCheckPermission("member.info.board") + @SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR) public Object userStateMember() { Sql sql = Sqls.create(""" SELECT diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoGroupController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoGroupController.java index ae4ca34a..82fcb814 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoGroupController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoGroupController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.staffmanage.member.controller.info; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.DesensitizedUtil; import com.alibaba.excel.EasyExcel; import com.budwk.app.base.annotation.SLog; @@ -39,10 +40,10 @@ import java.util.List; * @Date 2024/8/8 10:06 * @注释 会员档案管理 */ -@At("/platform/member/info/group") -@Ok("json:full") -@IocBean @Slf4j +@IocBean +@Ok("json:full") +@At("/platform/member/info/group") public class MemberInfoGroupController { @Inject @@ -54,11 +55,16 @@ public class MemberInfoGroupController { public void index() { } + @At + @Ok("beetl:/platform/zhghh5/staffmanage/member/info/group/index.html") + @SaCheckPermission("h5.member.info.group") + public void h5() { + } @At - @SaCheckPermission("member.info.group") + @SaCheckPermission(value = {"member.info.group", "h5.member.info.group"}, mode = SaMode.OR) @Ok("json:{dateFormat:'yyyy-MM-dd'}") - public Result pageData(@Valid @Param("pageForm") MemberInfoPageForm pageForm) { + public Result pageData(MemberInfoPageForm pageForm) { Sql sql = memberInfoService.getSql(pageForm); Pagination pagination = memberInfoService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); for (NutMap row : pagination.getList()) { @@ -78,7 +84,7 @@ public class MemberInfoGroupController { @At @SaCheckPermission("member.info.group") @Aop(TransAop.READ_COMMITTED) - @SLog(type = "memberInfoGroup", tag = "备份会员数据", msg = "备份会员数据") + @SLog(tag = "备份会员数据", msg = "备份会员数据") public Result archive(@Valid Integer year) { try { memberInfoService.archiveMember(year); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/modelworker/MemberModelWorkerController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/modelworker/MemberModelWorkerController.java deleted file mode 100644 index 19188dc0..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/modelworker/MemberModelWorkerController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.modelworker; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.result.Result; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberModelWorkerPageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberModelWorkerService; -import lombok.extern.slf4j.Slf4j; -import org.nutz.dao.Chain; -import org.nutz.dao.Cnd; -import org.nutz.dao.sql.Sql; -import org.nutz.ioc.loader.annotation.Inject; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.Lang; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; - -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; - -/** - * @version 1.0 - * @Author zzr - * @name：MemberModelWorkerController - * @Date 2024/9/25 14:24 - * @注释 - */ -@Slf4j -@IocBean -@Ok("json") -@At("/platform/member/modelWorker/manage") -public class MemberModelWorkerController { - - @Inject - private MemberModelWorkerService memberModelWorkerService; - - - @At("") - @Ok("beetl:/platform/zhgh/staffmanage/member/modelworker/manage/index.html") - @SaCheckPermission("member.modelWorker.manage") - public void index() {} - - - @At - @SaCheckPermission("member.modelWorker.manage") - public Result pageData(MemberModelWorkerPageForm pageForm) { - Sql sql = memberModelWorkerService.getSql(pageForm); - Pagination pagination = memberModelWorkerService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); - return Result.success(pagination); - } - - - @At - @SaCheckPermission("member.modelWorker.manage") - public Result setModelWorker(String userId) { - if (StrUtil.isNotBlank(userId)) { - memberModelWorkerService.update(Chain.make("isModelWorker", true), Cnd.where("id", "=", userId)); - return Result.success(); - } else { - return Result.error(); - } - } - - /** - * 取消劳模身份 - * @return - */ - @At - @SaCheckPermission(value = {"member.modelWorker.manage","member.branchUnion.manage.list","member.schoolUnion.manage.list"}, mode = SaMode.OR) - public Result cancelModelWorker(@Param("userIds") String[] userIds) { - List list = Arrays.asList(userIds); - if (Lang.isNotEmpty(list)) { - memberModelWorkerService.update(Chain.make("isModelWorker", false), Cnd.where("id", "in", list)); - return Result.success(); - } else { - return Result.error(); - } - } - - - @At - @Ok("void") - @SaCheckPermission("member.modelWorker.manage") - public void doExport(MemberModelWorkerPageForm pageForm, HttpServletResponse response){ - memberModelWorkerService.doExport(pageForm, response); - } -} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java index f590b0ae..7d08614f 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java @@ -43,12 +43,6 @@ public class MemberComprehensiveController { public void index() { } - @At - @Ok("beetl:/platform/zhghh5/staffmanage/member/query/index.html") - @SaCheckPermission("h5.member.query") - public void h5() { - } - @At @SaCheckPermission("member.statistics.comprehensive") public Result pageData(MemberStatisticsPageForm pageForm) { diff --git a/src/main/resources/static/components/plugins/h5/TableList.vue b/src/main/resources/static/components/plugins/h5/TableList.vue index aeb86c00..eca9b7cd 100644 --- a/src/main/resources/static/components/plugins/h5/TableList.vue +++ b/src/main/resources/static/components/plugins/h5/TableList.vue @@ -94,6 +94,7 @@ module.exports = { if (this.tableData.length >= this.localPageForm.totalCount) { this.tableFinished = true } + this.$emit('update:page_form', {...this.localPageForm}); } }).finally(() => { loading.close() diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js index 520cf639..7e629942 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js @@ -37,32 +37,35 @@ {{ viewData.welfareMember ? '福利会员' : '非福利会员' }} - - - - - - - - - - - - - - - - -
- 无数据 - + `, + store, data() { return { viewData: {} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html index 25f40371..7f8bc541 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html @@ -57,7 +57,6 @@ layout("/layouts/platform.html"){ - 点击工号可显示人员信息；点击变更类型可显示当前记录的变更 - diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html index 0e63dc2f..59825ba0 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html @@ -48,7 +48,7 @@ layout("/layouts/platform_h5.html"){ 审核 -
+
撤回
@@ -150,7 +150,7 @@ layout("/layouts/platform_h5.html"){ }) }).then((res) => { if (res.code === 0) { - this.$refs.suggestionBoxInfoRef.onClose() + this.$refs.infoRef.onClose() this.$toast.success(res.msg) this.doSearch() } @@ -169,7 +169,7 @@ layout("/layouts/platform_h5.html"){ title: '提示', message: '您确定要撤回吗？', }).then(() => { - this.$axios.post('/flow/common/revokeTask', {taskId: row.startTaskId}).then(res => { + this.$axios.post('/flow/common/revokeTask', {taskId: row.taskId}).then(res => { if (res.code === 0) { this.$toast.success('撤回成功'); this.doSearch(); diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html index 200658ec..27e9d474 100644 --- a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html @@ -4,14 +4,17 @@ layout("/layouts/platform_h5.html"){
- + + + @@ -35,7 +38,7 @@ layout("/layouts/platform_h5.html"){ 审核
-
+
撤回
@@ -80,14 +83,11 @@ layout("/layouts/platform_h5.html"){ unitId: "", audit: false }, - tableData: [], unitList: [], auditList: [ { text: "已审核", value: true }, { text: "未审核", value: false } ], - tableLoading: false, - tableFinished: false, // 审核相关 formData: {}, @@ -141,7 +141,7 @@ layout("/layouts/platform_h5.html"){ }) }).then((res) => { if (res.code === 0) { - this.$refs.suggestionBoxInfoRef.onClose() + this.$refs.infoRef.onClose() this.$toast.success(res.msg) this.doSearch() } @@ -160,14 +160,13 @@ layout("/layouts/platform_h5.html"){ title: '提示', message: '您确定要撤回吗？', }).then(() => { - this.$axios.post('/flow/common/revokeTask', {taskId: row.startTaskId}).then(res => { + this.$axios.post('/flow/common/revokeTask', {taskId: row.taskId}).then(res => { if (res.code === 0) { this.$toast.success('撤回成功'); this.doSearch(); } }) - }).catch(() => { - }); + }) }, initUnion() { diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/mine/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/mine/index.html index ccd368d8..66ea324f 100644 --- a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/mine/index.html +++ b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/mine/index.html @@ -88,7 +88,7 @@ layout("/layouts/platform_h5.html"){ }, onEdit(row) { - this.$pjaxReplace('/platform/h5/member/apply/submit?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id) + this.$pjaxReplace('/platform/member/apply/submit/h5?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id) }, onRevoke(row) { @@ -156,9 +156,7 @@ layout("/layouts/platform_h5.html"){ v.text = v.name v.value = v.id }) - if (hasAdmin && !this.pageForm.unionId) { - this.unitList.unshift({ text: "全部单位", value: null }) - } + this.unitList.unshift({ text: "全部单位", value: null }) if (this.unitList && this.unitList.length > 0) { this.$set(this.pageForm, "unitId", this.unitList[0].value) } diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html index 1031ce4d..4a249c99 100644 --- a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html @@ -7,18 +7,21 @@ layout("/layouts/platform_h5.html"){ + @search="doSearch"> + + - +