From bee7b352a63781e4aee4d759acb9f9acdb1c2f85 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Tue, 9 Sep 2025 11:19:04 +0800 Subject: [PATCH] commit --- .../apply/ClubUserJoinApplyController.java | 4 +- .../apply/ClubUserJoinMineController.java | 2 + .../statistics/ClubStatisticsController.java | 5 +- .../app/zhgh/club/vo/ClubUserJoinVo.java | 1 + .../platform/js/util/h5AutoShowError.js | 2 +- .../platform/zhgh/club/common/clubUserJoin.js | 1 - .../zhgh/club/evaluate/schoolAudit/index.html | 2 +- .../zhgh/club/examine/schoolAudit/index.html | 2 +- .../club/infoManage/auditManager/index.html | 2 +- .../zhgh/club/infoManage/change/index.html | 2 +- .../club/infoManage/refreshReport/index.html | 2 +- .../infoManage/schoolAuditReport/index.html | 2 +- .../infoManage/schoolAuditRule/index.html | 2 +- .../platform/zhgh/club/join/apply/index.html | 35 +++-- .../zhgh/club/join/clubApproval/index.html | 2 +- .../platform/zhgh/club/join/mine/index.html | 2 +- .../club/join/schoolUnionApproval/index.html | 2 +- .../zhgh/club/register/schoolReply/index.html | 2 +- .../condolence/branchUnionApproval/index.html | 2 +- .../condolence/schoolUnionApproval/index.html | 2 +- .../platform/zhghh5/club/apply/index.html | 52 ++++---- .../zhghh5/club/common/clubUserJoin.js | 89 +++++++++---- .../platform/zhghh5/club/mine/index.html | 121 ++++++------------ 23 files changed, 169 insertions(+), 169 deletions(-) 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 91cba7fc..344df629 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 @@ -167,12 +167,12 @@ public class ClubUserJoinApplyController { } if (ObjectUtil.isNotEmpty(clubUser)) { - return Result.error("请勿重复申请!"); + return Result.error(99, "请勿重复申请!"); } ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", userApply.getId())); if (!processInstance.getState().equals(ProcessInstanceStateEnum.FINISHED.getCode())) { - return Result.error("您有该协会的申请记录尚未完成,请到我的申请里查看!"); + return Result.error(99, "您有该协会的申请记录尚未完成,请到我的申请里查看!"); } return Result.success(); } diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java index 3b206bac..74d61329 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java @@ -112,6 +112,7 @@ public class ClubUserJoinMineController { Sql sql = Sqls.create(""" SELECT cua.*, + club.clubName, u.loginname AS loginName, u.username AS userName, u.sex, @@ -125,6 +126,7 @@ public class ClubUserJoinMineController { FROM club_user_apply cua LEFT JOIN vw_user u ON u.id = cua.userId + LEFT JOIN sys_club club ON club.id = cua.clubId WHERE cua.id = @id """); sql.setParam("id",id); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java b/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java index e747fdd5..fae5c028 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java @@ -253,7 +253,6 @@ public class ClubStatisticsController { exportEntities.add(new ExcelExportEntity("退休人数", "retire", 20)); exportEntities.add(new ExcelExportEntity("男", "man", 20)); exportEntities.add(new ExcelExportEntity("女", "woman", 20)); - exportEntities.add(new ExcelExportEntity("理事机构人数", "governing_body", 20)); ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); @@ -335,11 +334,11 @@ public class ClubStatisticsController { club.clubCode, club.clubName, sum( CASE WHEN cu.userId is not null $myCondition THEN 1 ELSE 0 END ) AS total, - sum( CASE WHEN su.userState in ('在职', '在岗') $myCondition THEN 1 ELSE 0 END ) AS `work`, + sum( CASE WHEN su.userState in ('在职', '在岗') $myCondition THEN 1 ELSE 0 END ) AS `work`, sum( CASE WHEN su.userState in ('退休') $myCondition THEN 1 ELSE 0 END ) AS retire, sum( CASE WHEN su.sex like '%男%' $myCondition THEN 1 ELSE 0 END ) AS man, sum( CASE WHEN su.sex like '%女%' $myCondition THEN 1 ELSE 0 END ) AS woman, - sum( CASE WHEN cu.roleCode != 'CLUB_MEMBER' AND 1 = 1 $myCondition THEN 1 ELSE 0 END ) AS governing_body + sum( CASE WHEN ('CLUB_PRESIDENT' MEMBER OF (cu.roleCode) or 'CLUB_VICE_PRESIDENT' MEMBER OF (cu.roleCode) or 'CLUB_SECRETARY' MEMBER OF (cu.roleCode) or 'CLUB_VICE_SECRETARY' MEMBER OF (cu.roleCode)) AND 1 = 1 $myCondition THEN 1 ELSE 0 END ) AS governing_body FROM sys_club club LEFT JOIN club_user cu ON cu.clubId = club.id diff --git a/src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinVo.java b/src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinVo.java index 7c7137ba..c0ac0c8e 100644 --- a/src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinVo.java +++ b/src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinVo.java @@ -22,4 +22,5 @@ public class ClubUserJoinVo extends ClubUserApply { private String education; private String academicDegree; private String position; + private String clubName; } diff --git a/src/main/resources/static/assets/platform/js/util/h5AutoShowError.js b/src/main/resources/static/assets/platform/js/util/h5AutoShowError.js index dfca9303..6300a6e8 100644 --- a/src/main/resources/static/assets/platform/js/util/h5AutoShowError.js +++ b/src/main/resources/static/assets/platform/js/util/h5AutoShowError.js @@ -35,7 +35,7 @@ if (typeof Vue !== 'undefined') { const fieldName = firstError.name; // 滚动到字段 - this.scrollToField(fieldName); + // this.scrollToField(fieldName); // 获取 label const field = this.fields?.find(f => f.name === fieldName); diff --git a/src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js b/src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js index e0ef248f..37ffcab2 100644 --- a/src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js +++ b/src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js @@ -92,7 +92,6 @@ const clubUserJoin = { data() { return { viewData: {}, - activeName: "first", row: {}, doneTasks: [], } diff --git a/src/main/resources/views/platform/zhgh/club/evaluate/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/club/evaluate/schoolAudit/index.html index 6127966b..da012129 100644 --- a/src/main/resources/views/platform/zhgh/club/evaluate/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/club/evaluate/schoolAudit/index.html @@ -47,7 +47,7 @@ layout("/layouts/platform.html"){ - + - +