From 0c5a0deb035a523a314599e0acb6f0c67308ebf6 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Mon, 6 Jan 2025 09:30:09 +0800 Subject: [PATCH] commit --- .../club/applyIn/ClubApplyInController.java | 13 ++-- .../resources/views/mobile/club/inClub.html | 4 +- .../views/platform/sys/club/applyIn/sqrt.html | 60 ++++++++++++++----- 3 files changed, 57 insertions(+), 20 deletions(-) diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java index ca846de..29bdf1a 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java @@ -210,11 +210,16 @@ public class ClubApplyInController { @RequiresAuthentication public Object getCount() { int hasJoinCount = dao.count("sys_club", Cnd.NEW().and("isjs", "=", false) - .and("state", "=", ClubRegistAuditState.SCHOOL_PASS) - .and("id in (SELECT clubid from sys_club_user WHERE isNormal = true and userid = '" + ShiroUtil.getPrincipalProperty("id") + "') and 1", "=", 1)); + .and(new Static("id in (SELECT clubid from sys_club_user WHERE isNormal = true and status in (1,3,5) and userid = '%s')".formatted(ShiroUtil.getUserId())))); + + SqlExpressionGroup group = new SqlExpressionGroup(); + group.and("state", "=", ClubRegistAuditState.SCHOOL_PASS); + group.or(new Static("id in (select clubid from sys_club_user where userid = '%s' and invite = true and status in (6, 7))" + .formatted(ShiroUtil.getPlatformUid()))); + int noJoinCount = dao.count("sys_club", Cnd.NEW().and("isjs", "=", false) - .and("state", "=", ClubRegistAuditState.SCHOOL_PASS) - .and("id not in (SELECT clubid from sys_club_user WHERE isNormal = true and userid = '" + ShiroUtil.getPrincipalProperty("id") + "' and status not in (2, 4) ) and 1", "=", 1)); + .and(group) + .and(new Static("id not in (SELECT clubid from sys_club_user WHERE isNormal = true and userid = '%s' and status not in (2, 4, 6, 7) )".formatted(ShiroUtil.getUserId())))); return new NutMap().setv("hasJoinCount", hasJoinCount).setv("noJoinCount", noJoinCount); } diff --git a/src/main/resources/views/mobile/club/inClub.html b/src/main/resources/views/mobile/club/inClub.html index 909dfc6..96496de 100644 --- a/src/main/resources/views/mobile/club/inClub.html +++ b/src/main/resources/views/mobile/club/inClub.html @@ -317,8 +317,8 @@ layout("/mobile/platform.html"){ label="工作部门" :rules="[{ required: true }]"> - + - + @@ -276,7 +285,6 @@ layout("/layouts/platform.html"){ --> - * 微信号 @@ -444,7 +452,7 @@ layout("/layouts/platform.html"){ unitName: [{required: true, message: '必填', trigger: ['blur', 'change']}], mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}], // QQNumber: [{required: true, message: '必填', trigger: ['blur', 'change']}], - weChatNumber: [{required: true, message: '必填', trigger: ['blur', 'change']}], + //weChatNumber: [{required: true, message: '必填', trigger: ['blur', 'change']}], sickness: [{required: true, message: '必填', trigger: ['blur', 'change']}], familyUserName: [{required: true, message: '必填', trigger: ['blur', 'change']}], familyRelation: [{required: true, message: '必填', trigger: ['blur', 'change']}], @@ -471,6 +479,30 @@ layout("/layouts/platform.html"){ 'club-regist-info': httpVueLoader('/components/club/clubRegistInfo.vue'), }, methods: { + async rollbackInvite(o) { + const confirm = await this.$confirm('您确定要撤回吗？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + if (confirm === "confirm") { + const resp = await $.post('/platform/sys/club/sq/rollbackInvite', {clubId: o.id}) + this.$message.success(resp.msg) + this.doSearch() + } + }, + async inviteNotAgree(o) { + const confirm = await this.$confirm('您确定要不同意' + o.name + '的入会邀请吗？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + if (confirm === "confirm") { + const resp = await $.post('/platform/sys/club/sq/inviteNotAgree', {clubId: o.id}) + this.$message.success(resp.msg) + this.doSearch() + } + }, async yearAudit(row) { this.$confirm('您确定要提交今年的年审吗？', '提示', { confirmButtonText: '确定',