From 223811d097236fcce463d4979780f47b447a33fd Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Tue, 25 Feb 2025 16:15:19 +0800 Subject: [PATCH] commit --- .../club/regist/ClubXghReplyController.java | 22 ++++++++++------- .../static/components/club/clubRegistInfo.vue | 24 +++++++++---------- .../platform/sys/club/regist/xghReply.html | 2 +- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java index 20b9820..4356829 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java @@ -4,14 +4,12 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.page.Pagination; import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Roles; import io.v.nutz.base.model.Audit; import io.v.nutz.base.query.PageForm; import io.v.nutz.sys.constant.club.ClubRegistAuditState; -import io.v.nutz.sys.models.Sys_club; -import io.v.nutz.sys.models.Sys_club_user; -import io.v.nutz.sys.models.Sys_file; -import io.v.nutz.sys.models.Sys_user_role; +import io.v.nutz.sys.models.*; import io.v.nutz.sys.services.SysClubService; import io.v.nutz.sys.services.SysRoleService; import io.v.nutz.sys.services.SysUserService; @@ -44,15 +42,14 @@ public class ClubXghReplyController { @Inject private SysClubService sysClubService; - @Inject private SysUserService sysUserService; - @Inject private SysRoleService sysRoleService; - @Inject private Dao dao; + @Inject + private MsgApi msgApi; @At("") @Ok("beetl:/platform/sys/club/regist/xghReply.html") @@ -99,7 +96,7 @@ public class ClubXghReplyController { dao.clear(Sys_user_role.class, Cnd.where("stid", "=", clubId) .and("roleid", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04))); } else { - club.setState(ClubRegistAuditState.ST_CONFIRM); + club.setState(ClubRegistAuditState.SCHOOL_PASS); //审核通过加角色 List userRoles = new ArrayList<>(); List sysClubUsers = dao.query(Sys_club_user.class, @@ -115,6 +112,15 @@ public class ClubXghReplyController { sysUserService.clearCache(); sysRoleService.clearCache(); club.setFoundTime(StrUtil.blankToDefault(sys_club.getFoundTime(), DateUtil.now())); + + //校工会审核通过发短信给会长 + Sys_club_user sysClubUser = sysClubUsers.stream().filter(o -> o.getSf() == 1).findFirst().orElse(null); + if(sysClubUser != null) { + Sys_user sysUser = dao.fetch(Sys_user.class, sysClubUser.getUserid()); + String content = "%s老师您好，您申请注册的%s已经审核通过。".formatted(sysUser.getUsername(), club.getName()); + String link = ""; + msgApi.sendMsg(List.of("DingTalk"), sysUser.getLoginname(), 2, "协会注册", content, "", link); + } } club.setXghAuditId(audit.getId()); dao.updateIgnoreNull(club); diff --git a/src/main/resources/static/components/club/clubRegistInfo.vue b/src/main/resources/static/components/club/clubRegistInfo.vue index d41750c..094cfdc 100644 --- a/src/main/resources/static/components/club/clubRegistInfo.vue +++ b/src/main/resources/static/components/club/clubRegistInfo.vue @@ -136,13 +136,13 @@ - {{ viewData.unitPartAudit.username }} + {{ viewData.unitPartAudit?.username }} - {{ viewData.unitPartAudit.auditTime }} + {{ viewData.unitPartAudit?.auditTime }} - {{ viewData.unitPartAudit.auditOpinion }} + {{ viewData.unitPartAudit?.auditOpinion }} @@ -151,13 +151,13 @@ - {{ viewData.xtAudit.username }} + {{ viewData.xtAudit?.username }} - {{ viewData.xtAudit.auditTime }} + {{ viewData.xtAudit?.auditTime }} - {{ viewData.xtAudit.auditOpinion }} + {{ viewData.xtAudit?.auditOpinion }} - {{ viewData.xldAudit.username }} + {{ viewData.xldAudit?.username }} - {{ viewData.xldAudit.auditTime }} + {{ viewData.xldAudit?.auditTime }} - {{ viewData.xldAudit.auditOpinion }} + {{ viewData.xldAudit?.auditOpinion }} @@ -186,13 +186,13 @@ - {{ viewData.xghAudit.username }} + {{ viewData.xghAudit?.username }} - {{ viewData.xghAudit.auditTime }} + {{ viewData.xghAudit?.auditTime }} - {{ viewData.xghAudit.auditOpinion }} + {{ viewData.xghAudit?.auditOpinion }} {{ viewData.foundTime }} diff --git a/src/main/resources/views/platform/sys/club/regist/xghReply.html b/src/main/resources/views/platform/sys/club/regist/xghReply.html index 4b03f68..f4d9f6a 100644 --- a/src/main/resources/views/platform/sys/club/regist/xghReply.html +++ b/src/main/resources/views/platform/sys/club/regist/xghReply.html @@ -78,7 +78,7 @@ layout("/layouts/platform.html"){