From 558885d62495607ad89f8ffef4dac8f5ee98a63f Mon Sep 17 00:00:00 2001 From: Paidax Date: Thu, 4 Sep 2025 09:14:02 +0800 Subject: [PATCH 1/5] commit --- .../base/event/role/RoleEventListener.java | 13 +++ .../app/base/event/role/RoleEventMsg.java | 67 +++++++++++ .../base/event/role/RoleEventPublisher.java | 21 ++++ .../sys/listener/SysRoleEventListener.java | 108 ++++++++++++++++++ .../impl/SysDataUserAllUpdateServiceImpl.java | 16 ++- .../ActivityDeclareMineController.java | 3 +- .../ActivityReimbursementApplyController.java | 43 ++++--- .../models/ActivityReimbursementInfo.java | 7 ++ .../impl/MemberStatisticsServiceImpl.java | 2 +- .../MemberPaymentChartSummaryController.java | 2 +- .../MemberPaymentSummaryController.java | 15 ++- .../h5controller/H5ChildManageController.java | 27 +++++ .../components/plugins/sysImport/index.vue | 1 + .../declare/mine/index.html | 6 +- .../reimbursement/apply/index.html | 65 ++++++++--- .../reimbursement/mine/index.html | 10 +- .../member/change/common/memberChange.js | 15 ++- .../member/change/manage/index.html | 1 - .../staffmanage/member/info/group/index.html | 53 --------- .../statistics/comprehensive/index.html | 2 +- .../membercost/chartSummary/index.html | 12 +- .../zhgh/staffmanage/membercost/summary.html | 11 +- .../staffmanage/childmanage/mine/idnex.html | 0 .../staffmanage/childmanage/write/index.html | 26 +++++ 24 files changed, 408 insertions(+), 118 deletions(-) create mode 100644 src/main/java/com/budwk/app/base/event/role/RoleEventListener.java create mode 100644 src/main/java/com/budwk/app/base/event/role/RoleEventMsg.java create mode 100644 src/main/java/com/budwk/app/base/event/role/RoleEventPublisher.java create mode 100644 src/main/java/com/budwk/app/sys/listener/SysRoleEventListener.java create mode 100644 src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java create mode 100644 src/main/resources/views/platform/zhghh5/staffmanage/childmanage/mine/idnex.html create mode 100644 src/main/resources/views/platform/zhghh5/staffmanage/childmanage/write/index.html diff --git a/src/main/java/com/budwk/app/base/event/role/RoleEventListener.java b/src/main/java/com/budwk/app/base/event/role/RoleEventListener.java new file mode 100644 index 00000000..36ae34d2 --- /dev/null +++ b/src/main/java/com/budwk/app/base/event/role/RoleEventListener.java @@ -0,0 +1,13 @@ +package com.budwk.app.base.event.role; + +/** + * @version 1.0 + * @Author zzr + * @name：RoleEventListener + * @Date 2025/9/3 17:13 + * @注释 + */ +public interface RoleEventListener { + + void receive(RoleEventMsg message); +} diff --git a/src/main/java/com/budwk/app/base/event/role/RoleEventMsg.java b/src/main/java/com/budwk/app/base/event/role/RoleEventMsg.java new file mode 100644 index 00000000..c1e5213f --- /dev/null +++ b/src/main/java/com/budwk/app/base/event/role/RoleEventMsg.java @@ -0,0 +1,67 @@ +package com.budwk.app.base.event.role; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：RoleEventMsg + * @Date 2025/9/3 17:14 + * @注释 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class RoleEventMsg { + + /** + * 用户id + */ + private List userIds; + + /** + * 角色code + */ + private String roleCode; + + /** + * 单位id + */ + private String unitId; + + /** + * 操作类型 + */ + private Integer operationType; + + /** + * 添加角色 + */ + public static final int ADD_ROLE = 1; + + /** + * 删除角色 + */ + public static final int REMOVE_ROLE = 2; + + /** + * 更新角色 + */ + public static final int RENEW_ROLE = 3; + + + public RoleEventMsg(String unitId, String roleCode, Integer operationType){ + this.unitId = unitId; + this.operationType = operationType; + } + + public RoleEventMsg(List userIds, String roleCode, Integer operationType){ + this.userIds = userIds; + this.roleCode = roleCode; + this.operationType = operationType; + } +} diff --git a/src/main/java/com/budwk/app/base/event/role/RoleEventPublisher.java b/src/main/java/com/budwk/app/base/event/role/RoleEventPublisher.java new file mode 100644 index 00000000..59ae31a1 --- /dev/null +++ b/src/main/java/com/budwk/app/base/event/role/RoleEventPublisher.java @@ -0,0 +1,21 @@ +package com.budwk.app.base.event.role; + +import org.nutz.mvc.Mvcs; + +/** + * @version 1.0 + * @Author zzr + * @name：RoleEventPublisher + * @Date 2025/9/3 17:14 + * @注释 + */ +public class RoleEventPublisher { + + public static void broadcast(RoleEventMsg event){ + String[] names = Mvcs.getIoc().getNamesByType(RoleEventListener.class); + for (String name : names) { + RoleEventListener listener = Mvcs.getIoc().get(RoleEventListener.class, name); + listener.receive(event); + } + } +} diff --git a/src/main/java/com/budwk/app/sys/listener/SysRoleEventListener.java b/src/main/java/com/budwk/app/sys/listener/SysRoleEventListener.java new file mode 100644 index 00000000..24f90de3 --- /dev/null +++ b/src/main/java/com/budwk/app/sys/listener/SysRoleEventListener.java @@ -0,0 +1,108 @@ +package com.budwk.app.sys.listener; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.event.role.RoleEventListener; +import com.budwk.app.base.event.role.RoleEventMsg; +import com.budwk.app.sys.models.Sys_role; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.sys.models.Sys_user_role; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; + +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：SysRoleEventListener + * @Date 2025/9/3 17:35 + * @注释 + */ +@IocBean +public class SysRoleEventListener implements RoleEventListener { + + @Inject + private Dao dao; + + @Override + @Aop(TransAop.READ_COMMITTED) + public void receive(RoleEventMsg message) { + if (ObjectUtil.isAllEmpty(message.getUserIds(), message.getUnitId(), message.getRoleCode())) { + return; + } + switch (message.getOperationType()) { + case RoleEventMsg.ADD_ROLE -> { + addRole(message); + } + case RoleEventMsg.REMOVE_ROLE -> { + removeRole(message); + } + case RoleEventMsg.RENEW_ROLE -> { + removeRole(message); + addRole(message); + } + } + } + + + /** + * 添加角色 + * @param message 订阅消息 + */ + private void addRole(RoleEventMsg message) { + Sys_role role = dao.fetch(Sys_role.class, Cnd.where("code", "=", message.getRoleCode())); + + if (ObjectUtil.isAllNotEmpty(message.getUserIds(), message.getRoleCode())) { + List roleList = message.getUserIds().stream().map(item -> { + Sys_user_role userRole = new Sys_user_role(); + userRole.setUserId(item); + userRole.setUnitId(StrUtil.isNotBlank(message.getUnitId()) ? message.getUnitId() : null); + userRole.setRoleId(role.getId()); + return userRole; + }).toList(); + dao.insert(roleList); + } else if (ObjectUtil.isAllNotEmpty(message.getUnitId(), message.getRoleCode())) { + List userList = dao.query(Sys_user.class, Cnd.where("unitId", "=", message.getUnitId())); + List roleList = userList.stream().map(item -> { + Sys_user_role userRole = new Sys_user_role(); + userRole.setUserId(item.getId()); + userRole.setUnitId(item.getUnitId()); + userRole.setRoleId(role.getId()); + return userRole; + }).toList(); + dao.insert(roleList); + } + } + + + /** + * 删除角色 + * @param message 订阅消息 + */ + private void removeRole(RoleEventMsg message) { + // 判断传过来的东西 + if (ObjectUtil.isAllNotEmpty(message.getUserIds(), message.getUnitId(), message.getRoleCode())) { + dao.clear(Sys_user_role.class, + Cnd.where("userId", "in", message.getUserIds()) + .and("unitId", "=", message.getUnitId()) + .and("roleCode", "=", message.getRoleCode()) + ); + } else if (ObjectUtil.isAllNotEmpty(message.getUserIds(), message.getRoleCode())) { + dao.clear(Sys_user_role.class, + Cnd.where("userId", "in", message.getUserIds()) + .and("roleCode", "=", message.getRoleCode()) + ); + } else if (ObjectUtil.isAllNotEmpty(message.getUnitId(), message.getUnitId())) { + dao.clear(Sys_user_role.class, + Cnd.where("unitId", "in", message.getUnitId()) + .and("roleCode", "=", message.getRoleCode()) + ); + } + } + +} diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java index 09d26758..2b6b9ea2 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java @@ -7,6 +7,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HtmlUtil; import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.event.role.RoleEventMsg; +import com.budwk.app.base.event.role.RoleEventPublisher; import com.budwk.app.base.utils.ConditionGroupUtil; import com.budwk.app.base.utils.PwdUtil; import com.budwk.app.sys.annotation.DataCenterColumn; @@ -16,6 +18,7 @@ import com.budwk.app.sys.services.SysDataUserUpdateService; import com.budwk.app.sys.services.SysDictService; import com.budwk.app.sys.services.SysRoleService; import com.budwk.app.sys.services.SysUserService; +import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig; import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeType; import lombok.extern.slf4j.Slf4j; @@ -161,9 +164,9 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService Map userMap = sysUsers.stream().collect(Collectors.toMap(Sys_user::getLoginname, sysUser -> sysUser)); // 准备数据集合 - List needDoUpdateList = new ArrayList<>(); - List needInitUserList = new ArrayList<>(); - List histories = new ArrayList<>(); + List needDoUpdateList = new CopyOnWriteArrayList<>(); + List needInitUserList = new CopyOnWriteArrayList<>(); + List histories = new CopyOnWriteArrayList<>(); List addMemberUserIds = Collections.synchronizedList(new ArrayList<>()); List removeMemberUserIds = Collections.synchronizedList(new ArrayList<>()); @@ -380,6 +383,13 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService }); } + // 6. 处理其他任务 + // 6.1 更新提案的校领导角色，发送订阅 + ProposalConfig config = dao.fetch(ProposalConfig.class, Cnd.where("delFlag", "=", false).desc("updatedAt")); + for (String unitId : config.getSchoolLeaderUnitIds()) { + RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE)); + } + long endTime = System.currentTimeMillis(); log.info("全量更新用户数据完成，耗时: {} 毫秒", (endTime - startTime)); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java index 322891d9..02776333 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java @@ -137,7 +137,6 @@ public class ActivityDeclareMineController { } else { cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy())); } - cnd.groupBy("t.id"); sql.setCondition(cnd); Pagination pagination = activityDeclareService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql); return Result.success().addData(pagination); @@ -178,7 +177,7 @@ public class ActivityDeclareMineController { @Ok("void") @SaCheckPermission("activityDeclare.mine") @SLog(tag = "活动申报", msg = "导出活动申报表") - public void doExport(@Valid String id, HttpServletResponse response) { + public void doExportDeclare(@Valid String id, HttpServletResponse response) { HashMap docData = new HashMap<>(); Sql sql = Sqls.create(""" diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java index ae70b0d5..546b1636 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java @@ -37,6 +37,7 @@ import org.nutz.mvc.annotation.Param; import javax.validation.Valid; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** @@ -87,9 +88,6 @@ public class ActivityReimbursementApplyController { .mapToDouble(v -> ObjectUtil.defaultIfNull(v.getActualPrice(), 0D)) .sum(); activityReimbursementInfo.setActualMoney(new BigDecimal(sum)); - if (StrUtil.isBlank(activityReimbursementInfo.getDeclareId())) { - activityReimbursementInfo.setDeclareId(activityReimbursementInfo.getId()); - } dao.insertOrUpdate(activityReimbursementInfo); return Result.success(); } @@ -110,9 +108,6 @@ public class ActivityReimbursementApplyController { .mapToDouble(v -> ObjectUtil.defaultIfNull(v.getActualPrice(), 0D)) .sum(); activityReimbursementInfo.setActualMoney(new BigDecimal(sum)); - if (StrUtil.isBlank(activityReimbursementInfo.getDeclareId())) { - activityReimbursementInfo.setDeclareId(activityReimbursementInfo.getId()); - } dao.insertOrUpdate(activityReimbursementInfo); // 开启流程实例 @@ -146,9 +141,6 @@ public class ActivityReimbursementApplyController { .mapToDouble(v -> ObjectUtil.defaultIfNull(v.getActualPrice(), 0D)) .sum(); activityReimbursementInfo.setActualMoney(new BigDecimal(sum)); - if (StrUtil.isBlank(activityReimbursementInfo.getDeclareId())) { - activityReimbursementInfo.setDeclareId(activityReimbursementInfo.getId()); - } dao.insertOrUpdate(activityReimbursementInfo); Dict dict = Dict.create(); @@ -162,14 +154,33 @@ public class ActivityReimbursementApplyController { @At @ApiOperation("获取当前用户活动报销") @SaCheckPermission("activityReimbursement.apply") - public Result getActivityReimbursementByUser() { - // 查询reimbursement表里面没有，在declare表里面有的申请记录 - Sql sql = Sqls.create("SELECT declareId FROM activity_reimbursement_info WHERE userId = @userId").setParam("userId", SecurityUtil.getUserId()); + public Result getActivityReimbursementByUser(String id) { + if (StrUtil.isNotBlank(id)) { + ActivityReimbursementInfo reimbursementInfo = dao.fetch(ActivityReimbursementInfo.class, id); + ActivityDeclareInfo info = dao.fetch(ActivityDeclareInfo.class, reimbursementInfo.getDeclareId()); + return Result.success().addData(List.of(info)); + } + + // 查询已经报销成功的记录 + Sql reiSql = Sqls.create(""" + SELECT + info.declareId + FROM + activity_reimbursement_info info + LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id + WHERE + userId = @userId + AND ins.state IN (10, 20) + """).setParam("userId", SecurityUtil.getUserId()); + reiSql.setCallback(Sqls.callback.strList()); + dao.execute(reiSql); + List reiDecIdList = reiSql.getList(String.class); + + Sql sql = Sqls.create("select declareId from activity_reimbursement_info where userId = @userId").setParam("userId", SecurityUtil.getUserId()); sql.setCallback(Sqls.callback.strList()); dao.execute(sql); List declareIdList = sql.getList(String.class); - Sql applySql = Sqls.create(""" SELECT info.* @@ -178,10 +189,12 @@ public class ActivityReimbursementApplyController { LEFT JOIN wf_process_instance ins ON info.id = ins.businessNo $condition """); - Cnd cnd = Cnd.NEW(); if (Lang.isNotEmpty(declareIdList)) { - cnd.and("info.id", "in", declareIdList); + cnd.and("info.id", "not in", declareIdList); + } + if (Lang.isNotEmpty(reiDecIdList)) { + cnd.and("info.id", "not in", reiDecIdList); } cnd.and("info.userId", "=", SecurityUtil.getUserId()); cnd.and("ins.state", "=", 20); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java index 1f02e4e5..fde498c4 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java @@ -5,6 +5,7 @@ import com.budwk.app.zhgh.activity.declarereimbursement.declare.models.ActivityD import lombok.Data; import lombok.EqualsAndHashCode; import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; import java.math.BigDecimal; import java.util.Date; @@ -22,6 +23,12 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class ActivityReimbursementInfo extends ActivityDeclareInfo { + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + @Column @Comment("申报id") @ColDefine(type = ColType.VARCHAR, width = 32) diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java index 10a06415..9b3379f0 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java @@ -60,7 +60,7 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl imple cnd.orderBy(pageForm.getPageOrderName(), pageForm.getPageOrderBy().equalsIgnoreCase("ascending") ? "ASC" : "DESC"); } - if (Lang.isNotEmpty(pageForm.getAge()) && !"0".equals(pageForm.getAge().get(0)) && !"0".equals(pageForm.getAge().get(1))) { + if (Lang.isNotEmpty(pageForm.getAge()) && !"0".equals(pageForm.getAge().get(1))) { if (reverseSelection) { cnd.andNot("TIMESTAMPDIFF(YEAR, u.birthday, CURDATE())", "between", pageForm.getAge().toArray()); } else { diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentChartSummaryController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentChartSummaryController.java index a74b598a..5d97e061 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentChartSummaryController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentChartSummaryController.java @@ -174,7 +174,7 @@ public class MemberPaymentChartSummaryController { ) subquery ON subquery.unionId = un.id GROUP BY un.id, - un.unionname, + un.name, un.unioncode ORDER BY un.unioncode; diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentSummaryController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentSummaryController.java index 6181a141..b6c839af 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentSummaryController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentSummaryController.java @@ -5,8 +5,10 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; @@ -104,9 +106,9 @@ public class MemberPaymentSummaryController { public Result modify(@Param("ids") String[] ids, String paymentMoney, boolean isPay, String remark) { List idList = Arrays.asList(ids); if (Lang.isNotEmpty(idList)) { - if (!isPay) { + if (isPay) { //未缴费设为已缴费 - memberPaymentService.update(Chain.make("paymentMoney", paymentMoney) + memberPaymentService.update(Chain.make("paymentMoney", NumberUtil.mul(paymentMoney, "100")) .add("remark", remark).add("isPayment", 1) .add("paymentTime", new Date()), Cnd.where("id", "in", idList)); @@ -134,9 +136,16 @@ public class MemberPaymentSummaryController { @ApiOperation("下载导入模版") @SaCheckPermission("member.payment.summary") public void downloadImportTemp(HttpServletResponse response) { + List exportEntities = new ArrayList<>(); + exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); + exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); + exportEntities.add(new ExcelExportEntity("缴纳金额", "paymentBase", 20)); + exportEntities.add(new ExcelExportEntity("是否缴费", "isPay", 20)); + exportEntities.add(new ExcelExportEntity("备注", "remark", 20)); + ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); - Workbook workbook = ExcelExportUtil.exportExcel(exportParams, MemberPaymentTemp.class, new ArrayList<>()); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, new ArrayList<>()); CommonDownloadUtil.download("会员缴费导入模版.xlsx", workbook, response); } diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java new file mode 100644 index 00000000..19cd57be --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java @@ -0,0 +1,27 @@ +package com.budwk.app.zhgh.user.childManage.h5controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import lombok.extern.slf4j.Slf4j; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author hqw + * @name：H5ChildManageController + * @Date 2025/9/4 8:52 + * @注释 + */ +@Slf4j +@IocBean +@Ok("json") +@At("/platform/childManage/manage/h5") +public class H5ChildManageController { + + @At("") + @Ok("beetl:/platform/zhghh5/staffmanage/childmanage/") + @SaCheckPermission("childManage.h5") + public void index() { + } +} diff --git a/src/main/resources/static/components/plugins/sysImport/index.vue b/src/main/resources/static/components/plugins/sysImport/index.vue index 368ca8cb..22ce571a 100644 --- a/src/main/resources/static/components/plugins/sysImport/index.vue +++ b/src/main/resources/static/components/plugins/sysImport/index.vue @@ -36,6 +36,7 @@ } " :auto-upload="false" + action :limit="1" :file-list="importData.fileList" > diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html index 42b75d4b..69d45387 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html @@ -93,7 +93,7 @@ layout("/layouts/platform.html"){ 删除 - 导出 + 申请表导出 @@ -143,8 +143,8 @@ layout("/layouts/platform.html"){ 'info': INFO }, methods: { - doExport(row){ - this.$downLoad('/platform/activityDeclare/mine/doExport?id=' + row.id) + doExportDeclare(row){ + this.$downLoad('/platform/activityDeclare/mine/doExportDeclare?id=' + row.id) }, onApply() { window.location.href = '/platform/activityDeclare/apply' diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html index 83188d05..4654d533 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html @@ -13,8 +13,8 @@ layout("/layouts/platform.html"){ - - + @@ -28,7 +28,7 @@ layout("/layouts/platform.html"){ - - + @@ -144,8 +144,8 @@ layout("/layouts/platform.html"){ }, methods: { // 导出示例 - doExport(row){ - this.$downLoad('/platform/activityDeclare/mine/doExport?id=' + row.declareId) + doExportDeclare(row){ + this.$downLoad('/platform/activityDeclare/mine/doExportDeclare?id=' + row.declareId) }, // 导出报销凭证 doExportReimbursement(row){ diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js index 043dfe5a..18091ba1 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js @@ -2,8 +2,8 @@ const MEMBER_CHANGE = { template: /*language=HTML*/ `
会员变更
- - + + @@ -17,8 +17,8 @@ const MEMBER_CHANGE = { - - + + @@ -515,5 +515,10 @@ const MEMBER_CHANGE = { }, created(){ this.init() - } + }, + style: /*language=CSS*/ ` + .el-descriptions-item__label { + width: 15% !important; + } + ` } diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html index 2298d038..3a245bc3 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html @@ -170,7 +170,6 @@ layout("/layouts/platform.html"){ el: "#app", store, mixins: [initTableMixins], - dicts: ['USER_SEX', 'USER_STATE', 'PERSON_TYPE', 'MEMBER_CHANGE_TYPE'], data: { pickerOptions: { shortcuts: [{ diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/group/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/group/index.html index 40cfd1a0..500975eb 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/group/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/group/index.html @@ -1,59 +1,6 @@ -