From 6a07605b39038ef27f63de0f4cdd2984575908c3 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Thu, 22 Jan 2026 17:32:06 +0800 Subject: [PATCH] commit --- .../job/club/ClubGeneratePayRecordJob.java | 60 ++++++++++++ .../apply/ClubUserJoinApplyController.java | 22 +++-- .../apply/ClubUserJoinApprovalController.java | 8 +- .../apply/ClubUserMineClubController.java | 13 ++- .../ClubChangeManagerController.java | 27 +++++- .../infoManage/ClubPayRecordController.java | 3 +- .../interceptor/ClubUserExitInterceptor.java | 49 ++++++++++ .../interceptor/ClubUserJoinInterceptor.java | 20 +++- .../app/zhgh/club/model/SysClubManager.java | 5 + .../app/zhgh/club/model/SysClubRefresh.java | 5 + .../zhgh/club/param/ClubUserJoinPageForm.java | 1 + .../club/service/impl/SysClubServiceImpl.java | 1 + .../app/zhgh/club/vo/ClubCommonPageVo.java | 1 + .../components/plugins/h5/TableList.vue | 2 +- .../zhgh/club/infoManage/change/index.html | 25 +++++ .../zhgh/club/infoManage/pay/index.html | 8 +- .../club/infoManage/refreshReport/index.html | 56 +++++++++-- .../platform/zhgh/club/join/apply/index.html | 7 +- .../zhgh/club/join/clubApproval/index.html | 15 ++- .../platform/zhgh/club/join/list/index.html | 18 ++++ .../platform/zhgh/club/join/mine/index.html | 21 +++- .../zhgh/club/join/mineclub/index.html | 18 ++++ .../platform/zhghh5/club/apply/index.html | 5 +- .../zhghh5/club/clubApproval/index.html | 39 +++++++- .../zhghh5/club/common/clubUserJoin.js | 6 +- .../platform/zhghh5/club/mine/index.html | 26 ++++- .../platform/zhghh5/club/mineclub/index.html | 95 +++++++++++++++++++ 27 files changed, 515 insertions(+), 41 deletions(-) create mode 100644 src/main/java/com/budwk/app/task/job/club/ClubGeneratePayRecordJob.java create mode 100644 src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserExitInterceptor.java create mode 100644 src/main/resources/views/platform/zhghh5/club/mineclub/index.html diff --git a/src/main/java/com/budwk/app/task/job/club/ClubGeneratePayRecordJob.java b/src/main/java/com/budwk/app/task/job/club/ClubGeneratePayRecordJob.java new file mode 100644 index 00000000..518c6b28 --- /dev/null +++ b/src/main/java/com/budwk/app/task/job/club/ClubGeneratePayRecordJob.java @@ -0,0 +1,60 @@ +package com.budwk.app.task.job.club; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.json.JSONObject; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.club.model.ClubPayRecord; +import com.budwk.app.zhgh.club.model.ClubUser; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +import java.util.ArrayList; +import java.util.List; + +/** + * @ClassName ClubGeneratePayRecordJob + * @Author JyuHsin + * @Date 2026/1/22 16:56 + * @Version 1.0 + * @Description 每年的1月1日生成协会成员下年的缴费记录 + */ +@IocBean +public class ClubGeneratePayRecordJob implements Job { + + @Inject + private Dao dao; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + // 当前年份 + int thisYear = DateUtil.thisYear(); + // 获取最新的协会成员信息 + List clubUserList = dao.query(ClubUser.class, Cnd.NEW()); + // 生成缴费记录对象 + List list = new ArrayList<>(); + for (ClubUser clubUser : clubUserList) { + ClubPayRecord clubPayRecord = new ClubPayRecord(); + clubPayRecord.setYear(thisYear); + clubPayRecord.setClubId(clubUser.getClubId()); + clubPayRecord.setUserId(clubUser.getUserId()); + clubPayRecord.setPayed(false); + + JSONObject log = new JSONObject(); + log.set("operatorUserId", "task"); + log.set("operatorUserName", "定时任务"); + log.set("operatorTime", DateUtil.now()); + log.set("operatorType", "缴费管理-定时任务自动设置"); + log.set("oldValue", null); + log.set("newValue", false); + clubPayRecord.setOperateLogs(List.of(log)); + + list.add(clubPayRecord); + } + dao.insert(list); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java index e0d7d57d..fbdd8db4 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java @@ -120,18 +120,28 @@ public class ClubUserJoinApplyController { @ApiOperation("提交") @SaCheckPermission(value = {"club.join.apply", "h5.club.join.apply"}, mode = SaMode.OR) @Aop(TransAop.READ_COMMITTED) - @SLog(tag = "协会管理系统-申请入会", msg = "申请协会入会") - public Result submit(ClubUserApply clubUserApply) { - ClubUserApply userApply = dao.fetch(ClubUserApply.class, Cnd.where("userId", "=", clubUserApply.getUserId()).and("clubId", "=", clubUserApply.getClubId()).and("mode", "=", 1).desc(ClubUserApply::getApplyDate)); - if (ObjectUtil.isNotEmpty(userApply) && StrUtil.isBlank(userApply.getId())) { + @SLog(tag = "协会管理系统-申请入/退会", msg = "申请协会入/退会") + public Result submit(@Param("data") ClubUserApply clubUserApply, + @Param("mode") Boolean mode) { + if(mode == false) { + clubUserApply = dao.fetch( + ClubUserApply.class, + Cnd.where("userId", "=", SecurityUtil.getUserId()) + .and("clubId", "=", clubUserApply.getClubId()) + .desc("applyDate") + ); + } + ClubUserApply userApply = dao.fetch(ClubUserApply.class, Cnd.where("userId", "=", clubUserApply.getUserId()).and("clubId", "=", clubUserApply.getClubId()).and("mode", "=", mode).desc(ClubUserApply::getApplyDate)); + if (ObjectUtil.isNotEmpty(userApply) && StrUtil.isNotBlank(userApply.getId())) { ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", userApply.getId())); if (!List.of(ProcessInstanceStateEnum.REJECT.getCode(), ProcessInstanceStateEnum.FINISHED.getCode()).contains(processInstance.getState())) { return Result.error("您有该协会的申请记录尚未完成，请到我的申请里查看！"); } } + clubUserApply.setId(null); clubUserApply.setRoleCode(RoleConstant.CLUB_MEMBER.name()); - clubUserApply.setMode(true); + clubUserApply.setMode(mode); clubUserApply.setApplyDate(new Date()); dao.insertOrUpdate(clubUserApply); @@ -140,7 +150,7 @@ public class ClubUserJoinApplyController { args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode()); args.set(FlowConst.FORM_DATA, clubUserApply); args.set("clubId", clubUserApply.getClubId()); - ProcessInstance instance = flowEngine.startProcessInstanceByKey("XHRH", clubUserApply.getId(), SecurityUtil.getUserId(), args); + ProcessInstance instance = flowEngine.startProcessInstanceByKey(mode ? "XHRH" : "XHTH", clubUserApply.getId(), SecurityUtil.getUserId(), args); // 自动完成第一个申请任务 List doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java index 1ab66736..7bb72a64 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java @@ -99,7 +99,13 @@ public class ClubUserJoinApprovalController { """); Cnd cnd = Cnd.NEW(); - cnd.and("t.taskName", "=", "1625a683-3890-4788-95b7-cab8240f6731"); + if(pageForm.getMode() == null) { + cnd.and("t.taskName", "in", List.of("1625a683-3890-4788-95b7-cab8240f6731", "ae7337f8-b435-458d-abd9-4fa4f8d69f0b")); + } else if(pageForm.getMode()) { + cnd.and("t.taskName", "=", "1625a683-3890-4788-95b7-cab8240f6731"); + } else { + cnd.and("t.taskName", "=", "ae7337f8-b435-458d-abd9-4fa4f8d69f0b"); + } cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.andEX("YEAR(info.applyDate)","=",pageForm.getYear()); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java index 353c824a..9e0ca82e 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.club.controller.apply; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; @@ -41,12 +42,17 @@ public class ClubUserMineClubController { @Ok("beetl:/platform/zhgh/club/join/mineclub/index.html") public void index() {} + @At("/h5") + @SaCheckPermission("h5.club.join.mine.club") + @Ok("beetl:/platform/zhghh5/club/mineclub/index.html") + public void h5Index() {} + @At - @SaCheckPermission("club.join.mine.club") + @SaCheckPermission(value = {"club.join.mine.club", "h5.club.join.mine.club"}, mode = SaMode.OR) public Result pageData(@Valid ClubUserPageForm pageForm) { List query = dao.query(ClubUser.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).groupBy("clubId")); if (Lang.isEmpty(query)) { - return Result.success(); + return Result.success(new Pagination()); } List clubIds = query.stream().map(ClubUser::getClubId).toList(); @@ -57,6 +63,7 @@ public class ClubUserMineClubController { Sql sql = Sqls.create(""" SELECT club.*, + club.id as clubId, COUNT(DISTINCT ( uc.userId )) AS currentPeopleNum, presidentUser.username AS clubLeader, secretaryUser.username AS clubSecretary @@ -80,7 +87,7 @@ public class ClubUserMineClubController { } @At - @SaCheckPermission("club.join.mine.club") + @SaCheckPermission(value = {"club.join.mine.club", "h5.club.join.mine.club"}, mode = SaMode.OR) public Result getClubUsers(@Valid String clubId) { List clubUser = clubUserService.getClubUser(clubId); return Result.success(clubUser); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubChangeManagerController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubChangeManagerController.java index be0f0167..a6e34fbf 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubChangeManagerController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubChangeManagerController.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.PageUtil; @@ -12,14 +13,13 @@ import com.budwk.app.flow.constant.FlowConst; import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.flow.entity.ProcessInstance; import com.budwk.app.flow.entity.ProcessTask; +import com.budwk.app.flow.enums.ProcessInstanceStateEnum; import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; import com.budwk.app.flow.service.FlowCommonService; import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.club.model.ClubUser; -import com.budwk.app.zhgh.club.model.SysClub; -import com.budwk.app.zhgh.club.model.SysClubManager; -import com.budwk.app.zhgh.club.model.SysClubRule; +import com.budwk.app.zhgh.club.model.*; import com.budwk.app.zhgh.club.param.ClubUserPageForm; import com.budwk.app.zhgh.club.service.SysClubInfoManageService; import com.budwk.app.zhgh.club.service.impl.SysClubUserServiceImpl; @@ -33,6 +33,7 @@ import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.json.Json; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -130,6 +131,24 @@ public class ClubChangeManagerController { @SLog(tag = "协会管理系统-信息管理", msg = "提交变更理事机构") public Object submit(@Param("data") SysClubManager clubManager) { + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + String errMsg = "校工会审核" + clubManager.getPeriod() + "的换届报告通过后才能变更理事成员"; + // 查询这个届数有没有上传换届报告，并且审核通过 + List list = dao.query( + SysClubRefresh.class, + Cnd.where(SysClubRefresh::getClubId, "=", clubManager.getClubId()) + .and(SysClubRefresh::getPeriod, "=", clubManager.getPeriod()) + ); + if (Lang.isEmpty(list)) { + return Result.error(99, errMsg); + } + List idList = list.stream().map(SysClubRefresh::getId).toList(); + int count = dao.count(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", idList).and(ProcessInstance::getState, "in", List.of(ProcessInstanceStateEnum.FINISHED.getCode()))); + if (count == 0) { + return Result.error(99, errMsg); + } + } + ClubUser clubUser = dao.fetch(ClubUser.class, Cnd.where(ClubUser::getClubId, "=", clubManager.getClubId()).and(ClubUser::getUserId, "=", clubManager.getUserId())); clubManager.setUserId(SecurityUtil.getUserId()); clubManager.setUserName(SecurityUtil.getUserUsername()); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubPayRecordController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubPayRecordController.java index 221f7f4d..35cf4f67 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubPayRecordController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubPayRecordController.java @@ -73,7 +73,8 @@ public class ClubPayRecordController { u.unitName, u.retireDate, (SELECT createdAt FROM club_user WHERE clubId = cpr.clubId AND userId = cpr.userId ORDER BY createdAt LIMIT 1) AS applyTime, - u.userState + u.userState, + (select count(1) from club_user where clubId = cpr.clubId and userId = cpr.userId) as count FROM `club_pay_record` cpr LEFT JOIN sys_club c ON cpr.clubid = c.id diff --git a/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserExitInterceptor.java b/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserExitInterceptor.java new file mode 100644 index 00000000..915bb359 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserExitInterceptor.java @@ -0,0 +1,49 @@ +package com.budwk.app.zhgh.club.interceptor; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.json.JSONObject; +import com.budwk.app.flow.constant.FlowConst; +import com.budwk.app.flow.engine.FlowInterceptor; +import com.budwk.app.flow.engine.core.Execution; +import com.budwk.app.flow.engine.core.ServiceContext; +import com.budwk.app.sys.models.Sys_user_role; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.club.model.ClubPayRecord; +import com.budwk.app.zhgh.club.model.ClubUser; +import com.budwk.app.zhgh.club.model.ClubUserApply; +import com.budwk.app.zhgh.club.service.SysClubUserService; +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.json.Json; + +import java.util.List; + +/** + * @ClassName ClubUserJoinInterceptor + * @Author JyuHsin + * @Date 2025/8/22 16:07 + * @Version 1.0 + * @Description TODO + */ +public class ClubUserExitInterceptor implements FlowInterceptor { + + @Override + @Aop(TransAop.READ_COMMITTED) + public void intercept(Execution execution) { + + // 获取表单参数 + String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA); + ClubUserApply clubUserApply = Json.fromJson(ClubUserApply.class, formDataStr); + + // 获取操作类 + Dao dao = ServiceContext.find(Dao.class); + + // 删人 + dao.clear(ClubUser.class, Cnd.where(ClubUser::getUserId, "=", clubUserApply.getUserId()).and(ClubUser::getClubId, "=", clubUserApply.getClubId())); + // 删角色 + dao.clear(Sys_user_role.class, Cnd.where(Sys_user_role::getUserId, "=", clubUserApply.getUserId()).and(Sys_user_role::getClubId, "=", clubUserApply.getClubId())); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserJoinInterceptor.java b/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserJoinInterceptor.java index 753c9d05..91afb8cf 100644 --- a/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserJoinInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserJoinInterceptor.java @@ -41,7 +41,6 @@ public class ClubUserJoinInterceptor implements FlowInterceptor { // 获取操作类 Dao dao = ServiceContext.find(Dao.class); - SysClubUserService userService = ServiceContext.find(SysClubUserService.class); // 将申请信息复制一份，插入协会成员表 ClubUser clubUser = BeanUtil.copyProperties(clubUserApply, ClubUser.class); @@ -49,13 +48,13 @@ public class ClubUserJoinInterceptor implements FlowInterceptor { // 还要加到协会成员缴费表中 // 对了，如果同一个人，在同一年，多次加入同一协会，则只插入一条 - int count = dao.count( + ClubPayRecord payRecord = dao.fetch( ClubPayRecord.class, Cnd.where(ClubPayRecord::getClubId, "=", clubUser.getClubId()) .and(ClubPayRecord::getUserId, "=", clubUser.getUserId()) .and(ClubPayRecord::getYear, "=", DateUtil.thisYear()) ); - if (count == 0) { + if (payRecord == null) { ClubPayRecord record = new ClubPayRecord(); record.setClubId(clubUser.getClubId()); record.setUserId(clubUser.getUserId()); @@ -72,9 +71,22 @@ public class ClubUserJoinInterceptor implements FlowInterceptor { record.setOperateLogs(List.of(log)); dao.insert(record); + } else { + payRecord.setPayed(payed); + + JSONObject log = new JSONObject(); + log.set("operatorUserId", SecurityUtil.getUserId()); + log.set("operatorUserName", SecurityUtil.getUserUsername()); + log.set("operatorTime", DateUtil.now()); + log.set("operatorType", "入会审核"); + log.set("oldValue", payRecord.getPayed()); + log.set("newValue", payed); + + payRecord.setOperateLogs(List.of(log)); + dao.update(payRecord); } // 江苏卫生才有的，cao，将申请的人加入到活动组别里面去 - userService.clubUser2Scope(clubUser.getClubId(), List.of(clubUser.getUserId())); + // userService.clubUser2Scope(clubUser.getClubId(), List.of(clubUser.getUserId())); } } diff --git a/src/main/java/com/budwk/app/zhgh/club/model/SysClubManager.java b/src/main/java/com/budwk/app/zhgh/club/model/SysClubManager.java index dc18775b..f9d6a284 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/SysClubManager.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/SysClubManager.java @@ -68,4 +68,9 @@ public class SysClubManager extends BaseModel { @Comment("变更的身份") @ColDefine(type = ColType.MYSQL_JSON) private List nowRoleCode; + + @Column + @Comment("届数") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String period; } diff --git a/src/main/java/com/budwk/app/zhgh/club/model/SysClubRefresh.java b/src/main/java/com/budwk/app/zhgh/club/model/SysClubRefresh.java index 8701fa25..14bfb4c4 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/SysClubRefresh.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/SysClubRefresh.java @@ -59,4 +59,9 @@ public class SysClubRefresh extends BaseModel { @Comment("文件") @ColDefine(type = ColType.MYSQL_JSON) private List files; + + @Column + @Comment("届数") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String period; } diff --git a/src/main/java/com/budwk/app/zhgh/club/param/ClubUserJoinPageForm.java b/src/main/java/com/budwk/app/zhgh/club/param/ClubUserJoinPageForm.java index 1fab84f9..86392a1c 100644 --- a/src/main/java/com/budwk/app/zhgh/club/param/ClubUserJoinPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/club/param/ClubUserJoinPageForm.java @@ -13,5 +13,6 @@ public class ClubUserJoinPageForm extends PageForm { private String userName; private String unionId; private String unitId; + private Boolean mode; } diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java index 594f7815..2724b172 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java @@ -67,6 +67,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC Sql sql = Sqls.create(""" SELECT club.*, + club.id as clubId, u.username as concatPersonName, (select GROUP_CONCAT(username) from sys_user where id in (select userId from club_user u where u.clubId=club.id and JSON_CONTAINS(u.roleCode, '"CLUB_PRESIDENT"'))) as clubLeader, (select GROUP_CONCAT(username) from sys_user where id in (select userId from club_user u where u.clubId=club.id and JSON_CONTAINS(u.roleCode, '"CLUB_SECRETARY"'))) as clubSecretary, diff --git a/src/main/java/com/budwk/app/zhgh/club/vo/ClubCommonPageVo.java b/src/main/java/com/budwk/app/zhgh/club/vo/ClubCommonPageVo.java index f094a3be..b1cbc9e9 100644 --- a/src/main/java/com/budwk/app/zhgh/club/vo/ClubCommonPageVo.java +++ b/src/main/java/com/budwk/app/zhgh/club/vo/ClubCommonPageVo.java @@ -25,6 +25,7 @@ public class ClubCommonPageVo extends SysClub { private Integer status; private Integer exitStatus; private String clubLeader; + private String clubId; @ApiModelProperty("秘书长") private String clubSecretary; diff --git a/src/main/resources/static/components/plugins/h5/TableList.vue b/src/main/resources/static/components/plugins/h5/TableList.vue index c84bc6c9..1de02401 100644 --- a/src/main/resources/static/components/plugins/h5/TableList.vue +++ b/src/main/resources/static/components/plugins/h5/TableList.vue @@ -14,7 +14,7 @@
{{ calcTitle(row) }}
+ v-if="row?.instanceState" size="small">
diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/change/index.html b/src/main/resources/views/platform/zhgh/club/infoManage/change/index.html index 41f0c049..a53445c3 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/change/index.html +++ b/src/main/resources/views/platform/zhgh/club/infoManage/change/index.html @@ -76,6 +76,30 @@ layout("/layouts/platform.html"){ + + + + + + + + + + + + + + + + + + + + + + + + @@ -126,6 +150,7 @@ layout("/layouts/platform.html"){ clubId: [{ required: true, message: "必填", trigger: ["change", "blur"] }], userId: [{ required: true, message: "必填", trigger: ["change", "blur"] }], nowRoleCode: [{ required: true, message: "必填", trigger: ["change", "blur"] }], + period: [{ required: true, message: "必填", trigger: ["change", "blur"] }], }, viewData: {}, } diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/pay/index.html b/src/main/resources/views/platform/zhgh/club/infoManage/pay/index.html index 8caf28e9..845fea92 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/pay/index.html +++ b/src/main/resources/views/platform/zhgh/club/infoManage/pay/index.html @@ -84,6 +84,12 @@ layout("/layouts/platform.html"){ {{ row.userState }} + + +