From 902ad7e0e92ff13f20825c751850b1356ccdc22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Wed, 11 Nov 2026 18:21:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A4=BE=E5=9B=A2=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8D=8F=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/base/constant/BpmProcessConstant.java | 8 +-- .../budwk/app/base/constant/RoleConstant.java | 26 ++++---- ...wClubPresidentByArgsAssignmentHandler.java | 4 +- .../budwk/app/sys/models/Sys_user_role.java | 2 +- .../job/club/ClubGeneratePayRecordJob.java | 2 +- .../web/commons/auth/utils/SecurityUtil.java | 2 +- .../open/commons/CommonController.java | 2 +- .../ActivityBasicScopeController.java | 4 +- ...tivityCultureUserStatisticsController.java | 2 +- .../culture/models/ActivityTissue.java | 4 +- .../culture/models/ActivityTissuePerson.java | 2 +- ...ctivityDeclareClubPrincipalController.java | 4 +- .../ActivityDeclareMineController.java | 4 +- .../declare/models/ActivityDeclareInfo.java | 4 +- .../enums/ActivityDeclareReimbursement.java | 4 +- .../ActivityReimbursementBoardController.java | 10 ++-- ...yReimbursementClubPrincipalController.java | 4 +- .../ActivityReimbursementMineController.java | 4 +- .../controller/YearPlanController.java | 2 +- .../activity/planSummary/model/YearPlan.java | 6 +- .../planSummary/model/YearSummary.java | 6 +- .../sports/models/ActivitySchool.java | 4 +- .../manage/TrainSignUpManageController.java | 2 +- .../apply/ClubUserClubListController.java | 6 +- .../apply/ClubUserJoinApplyController.java | 22 +++---- .../apply/ClubUserJoinMineController.java | 6 +- .../apply/ClubUserMineClubController.java | 8 +-- .../common/ClubCommonController.java | 12 ++-- .../evaluate/ClubEvaluateApplyController.java | 4 +- .../evaluate/ClubEvaluateMineController.java | 2 +- .../examine/ClubExamineApplyController.java | 20 +++---- .../examine/ClubExamineMineController.java | 4 +- .../ClubChangeManagerController.java | 6 +- .../infoManage/ClubInfoManageController.java | 26 ++++---- .../infoManage/ClubPayRecordController.java | 10 ++-- .../ClubRefreshReportController.java | 8 +-- .../ClubRegisterImportController.java | 24 ++++---- .../infoManage/ClubRuleUpdateController.java | 6 +- .../ClubSchoolAuditReportController.java | 4 +- .../register/ClubConfirmController.java | 2 +- .../register/ClubMyApplyController.java | 6 +- .../register/ClubRegistApplyController.java | 6 +- .../statistics/ClubStatisticsController.java | 18 +++--- .../ClubRefreshUpdateInterceptor.java | 2 +- .../ClubRuleUpdateInterceptor.java | 2 +- .../interceptor/ClubUserExitInterceptor.java | 2 +- .../interceptor/ClubUserJoinInterceptor.java | 6 +- .../app/zhgh/club/model/ClubPayRecord.java | 4 +- .../budwk/app/zhgh/club/model/ClubUser.java | 8 +-- .../app/zhgh/club/model/ClubUserApply.java | 8 +-- .../budwk/app/zhgh/club/model/SysClub.java | 20 +++---- .../app/zhgh/club/model/SysClubEvaluate.java | 6 +- .../club/model/SysClubExamineRegister.java | 8 +-- .../model/SysClubExamineRegisterDetailed.java | 2 +- .../app/zhgh/club/model/SysClubManager.java | 4 +- .../app/zhgh/club/model/SysClubRefresh.java | 4 +- .../app/zhgh/club/model/SysClubRule.java | 4 +- .../app/zhgh/club/model/SysClubSponsor.java | 6 +- .../app/zhgh/club/param/ClubUserPageForm.java | 4 +- .../club/service/ClubPayRecordService.java | 16 ++--- .../service/ClubRegisterImportService.java | 18 +++--- .../club/service/ClubUserJoinService.java | 14 ++--- .../club/service/SysClubExamineService.java | 4 +- .../service/SysClubInfoManageService.java | 4 +- .../app/zhgh/club/service/SysClubService.java | 4 +- .../zhgh/club/service/SysClubUserService.java | 2 +- .../impl/ClubPayRecordServiceImpl.java | 16 ++--- .../service/impl/ClubUserJoinServiceImpl.java | 2 +- .../impl/SysClubExamineServiceImpl.java | 22 +++---- .../impl/SysClubInfoManageServiceImpl.java | 28 ++++----- .../club/service/impl/SysClubServiceImpl.java | 16 ++--- .../service/impl/SysClubUserServiceImpl.java | 2 +- .../app/zhgh/club/vo/ClubEvaluatePageVo.java | 4 +- .../controller/ArticleAnalysisController.java | 8 +-- .../ArticleClubApprovalController.java | 2 +- .../ArticleFirstExamineController.java | 2 +- .../controller/ArticleWriteController.java | 2 +- .../dayofficework/article/models/Article.java | 4 +- .../article/param/ArticleInfoPageParam.java | 2 +- .../service/ArticleAnalysisService.java | 2 +- .../impl/ArticleAnalysisServiceImpl.java | 4 +- .../article/vo/ArticleInfoPageVO.java | 4 +- .../caredata/UnionCareDataCon.java | 2 +- .../evaluation/models/EvaluateApply.java | 6 +- .../ActivityBudgetApplyController.java | 2 +- ...tivityBudgetQueryStatisticsController.java | 2 +- .../activityBudget/models/ActivityBudget.java | 2 +- .../impl/ActivityBudgetServiceImpl.java | 2 +- .../template/ActivityBudgetTemp.java | 2 +- ...OutlayManageClubBackHistoryController.java | 4 +- .../OutlayManageClubController.java | 10 ++-- .../OutlayManageClubQueryController.java | 22 +++---- .../OutlayManageClubUseDetailController.java | 18 +++--- .../club/model/OutlayClubUserBackHistory.java | 2 +- .../club/model/OutlayManageClub.java | 10 ++-- .../service/OutlayManageClubQueryService.java | 10 ++-- .../service/OutlayUseDetailService.java | 4 +- .../OutlayManageClubQueryServiceImpl.java | 18 +++--- .../impl/OutlayUseDetailServiceImpl.java | 10 ++-- .../OutlayReimburseClubAuditController.java | 4 +- .../OutlayReimburseClubZxAuditController.java | 2 +- .../model/OutlayReimburse.java | 4 +- .../impl/OutlayReimburseApplyServiceImpl.java | 2 +- .../controller/SiteCugManageController.java | 2 +- .../siteCug/model/SiteCugInfo.java | 2 +- .../service/impl/SiteCugApplyServiceImpl.java | 2 +- .../UnionReimburseApplyController.java | 10 ++-- .../UnionReimburseCollectController.java | 4 +- .../UnionReimburseFundSourceInterceptor.java | 4 +- .../unionReimburse/model/UnionReimburse.java | 8 +-- .../service/UnionReimburseService.java | 6 +- .../impl/UnionReimburseExportServiceImpl.java | 2 +- .../impl/UnionReimburseServiceImpl.java | 26 ++++---- .../club/init_club_member_statistics_menu.sql | 10 ++-- ...pic_icons_flat_skeuomorphic_blue_minio.sql | 26 ++++---- .../menus/update_sys_menu_pic_icons_minio.sql | 26 ++++---- src/main/resources/db/init/zhgh_zjnu.sql | 60 +++++++++---------- .../resources/db/sys_club_add_thumbnail.sql | 4 +- ...union_reimburse_add_club_activity_dict.sql | 4 +- .../components/module/activity/UserScope.vue | 6 +- .../activity/culture/common/applyActivity.js | 6 +- .../activity/culture/common/infoActivity.js | 2 +- .../zhgh/activity/culture/common/infoMange.js | 2 +- .../activity/culture/common/singleSignUp.js | 2 +- .../declare/apply/form.html | 6 +- .../declare/apply/index.html | 12 ++-- .../declare/apply/view.html | 2 +- .../declare/branchunion/index.html | 2 +- .../declare/clubprincipal/index.html | 6 +- .../declare/common/info.js | 2 +- .../declare/mine/index.html | 6 +- .../declare/schoolprincipal/index.html | 6 +- .../declare/schoolunion/index.html | 6 +- .../reimbursement/apply/index.html | 6 +- .../reimbursement/apply/view.html | 2 +- .../reimbursement/board/index.html | 12 ++-- .../reimbursement/branchunion/index.html | 2 +- .../reimbursement/clubprincipal/index.html | 6 +- .../reimbursement/common/info.js | 2 +- .../deputySchoolUnion/index.html | 6 +- .../reimbursement/mine/index.html | 6 +- .../reimbursement/schoolFinance/index.html | 6 +- .../reimbursement/schoolprincipal/index.html | 6 +- .../reimbursement/schoolunion/index.html | 6 +- .../planSummary/yearPlan/basicForm.js | 6 +- .../activity/planSummary/yearPlan/index.html | 6 +- .../activity/planSummary/yearPlan/info.js | 2 +- .../planSummary/yearSummary/basicForm.js | 6 +- .../planSummary/yearSummary/index.html | 6 +- .../activity/planSummary/yearSummary/info.js | 2 +- .../activity/sports/infoManage/addActivity.js | 8 +-- .../zhgh/club/common/clubInfoComponent.js | 14 ++--- .../zhgh/club/common/clubRoleConstant.js | 2 +- .../platform/zhgh/club/common/clubUserJoin.js | 2 +- .../zhgh/club/evaluate/apply/index.html | 10 ++-- .../zhgh/club/evaluate/clubAudit/index.html | 12 ++-- .../zhgh/club/evaluate/common/evaluateInfo.js | 6 +- .../zhgh/club/evaluate/mine/index.html | 12 ++-- .../zhgh/club/evaluate/schoolAudit/index.html | 12 ++-- .../evaluate/schoolLeaderAudit/index.html | 12 ++-- .../zhgh/club/examine/apply/index.html | 38 ++++++------ .../zhgh/club/examine/clubAudit/index.html | 6 +- .../zhgh/club/examine/common/examineInfo.js | 12 ++-- .../zhgh/club/examine/mine/index.html | 6 +- .../zhgh/club/examine/schoolAudit/index.html | 6 +- .../club/examine/schoolLeaderAudit/index.html | 6 +- .../club/infoManage/auditManager/index.html | 6 +- .../zhgh/club/infoManage/change/index.html | 30 +++++----- .../zhgh/club/infoManage/change/info.js | 2 +- .../club/infoManage/exitManage/index.html | 8 +-- .../zhgh/club/infoManage/exitManage/info.js | 2 +- .../zhgh/club/infoManage/fixedListLayout.css | 2 +- .../zhgh/club/infoManage/fixedListLayout.js | 2 +- .../club/infoManage/manage/clubInfoManage.js | 18 +++--- .../infoManage/manage/clubRegisterImport.js | 14 ++--- .../zhgh/club/infoManage/manage/index.html | 4 +- .../infoManage/manage/schoolClubManage.js | 16 ++--- .../zhgh/club/infoManage/pay/index.html | 8 +-- .../club/infoManage/refreshReport/index.html | 12 ++-- .../club/infoManage/refreshReport/info.js | 2 +- .../club/infoManage/ruleUpdate/index.html | 12 ++-- .../zhgh/club/infoManage/ruleUpdate/info.js | 6 +- .../infoManage/schoolAuditReport/index.html | 6 +- .../infoManage/schoolAuditRule/index.html | 6 +- .../platform/zhgh/club/join/apply/index.html | 18 +++--- .../zhgh/club/join/clubApproval/index.html | 2 +- .../platform/zhgh/club/join/list/index.html | 34 +++++------ .../platform/zhgh/club/join/mine/index.html | 2 +- .../zhgh/club/join/mineclub/index.html | 28 ++++----- .../club/join/schoolUnionApproval/index.html | 2 +- .../club/register/apply/clubRegisterForm.js | 26 ++++---- .../zhgh/club/register/apply/index.html | 8 +-- .../zhgh/club/register/clubConfirm/index.html | 8 +-- .../zhgh/club/register/mine/index.html | 14 ++--- .../zhgh/club/register/officeAudit/index.html | 8 +-- .../register/schoolLeaderAudit/index.html | 8 +-- .../zhgh/club/register/schoolReply/index.html | 8 +-- .../platform/zhgh/club/statistics/index.html | 12 ++-- .../platform/zhgh/club/statistics/member.html | 8 +-- .../dayofficework/article/analysis/index.html | 6 +- .../article/firstExamine/index.html | 4 +- .../dayofficework/article/query/index.html | 6 +- .../dayofficework/article/write/index.html | 2 +- .../dayofficework/careData/staff/index.html | 2 +- .../careData/unionCare/index.html | 12 ++-- .../activityBudget/allocationEdit/index.html | 4 +- .../activityBudget/applyStatistics/index.html | 4 +- .../activityBudget/queryStatistics/index.html | 2 +- .../activityBudget/schoolAudit/index.html | 2 +- .../activityBudget/schoolPrincipal/index.html | 2 +- .../outlayManage/club/backHistory/index.html | 6 +- .../outlayManage/club/manage/index.html | 8 +-- .../club/query/clubHistoryBackUser.js | 2 +- .../outlay/outlayManage/club/query/index.html | 8 +-- .../outlayManage/club/useDetail/index.html | 8 +-- .../outlay/outlayReimburse/apply/index.html | 6 +- .../dayofficework/siteCug/manage/basicForm.js | 2 +- .../unionReimburse/apply/index.html | 22 +++---- .../unionReimburse/mine/index.html | 2 +- .../unionReimburse/review/index.html | 2 +- .../zhghh5/activity/culture/applyUser.html | 2 +- .../platform/zhghh5/club/apply/index.html | 10 ++-- .../zhghh5/club/clubApproval/index.html | 14 ++--- .../zhghh5/club/common/clubUserJoin.js | 14 ++--- .../platform/zhghh5/club/list/index.html | 28 ++++----- .../platform/zhghh5/club/mine/index.html | 8 +-- .../platform/zhghh5/club/mineclub/index.html | 28 ++++----- .../outlayReimburse/apply/index.html | 4 +- .../outlayReimburse/clubAudit/index.html | 2 +- .../outlayReimburse/clubZxAudit/index.html | 2 +- .../unionReimburse/apply/index.html | 30 +++++----- .../unionReimburse/common/unionReimburse.css | 6 +- .../dayofficework/unionReimburse/info.js | 2 +- 233 files changed, 920 insertions(+), 920 deletions(-) diff --git a/src/main/java/com/budwk/app/base/constant/BpmProcessConstant.java b/src/main/java/com/budwk/app/base/constant/BpmProcessConstant.java index 0065cbb..60f2eca 100644 --- a/src/main/java/com/budwk/app/base/constant/BpmProcessConstant.java +++ b/src/main/java/com/budwk/app/base/constant/BpmProcessConstant.java @@ -29,13 +29,13 @@ public enum BpmProcessConstant { MEMBER_BRANCH_UNION_CHANGE("会员分工会变更"), - CLUB_JOIN("社团入会申请"), + CLUB_JOIN("协会入会申请"), - CLUB_EXAMINE("社团考核"), + CLUB_EXAMINE("协会考核"), - CLUB_EVALUATE("社团评优"), + CLUB_EVALUATE("协会评优"), - CLUB_REGISTER("社团注册"), + CLUB_REGISTER("协会注册"), PERSON_EVALUATE("评优评先申请"), diff --git a/src/main/java/com/budwk/app/base/constant/RoleConstant.java b/src/main/java/com/budwk/app/base/constant/RoleConstant.java index 718b076..209f506 100644 --- a/src/main/java/com/budwk/app/base/constant/RoleConstant.java +++ b/src/main/java/com/budwk/app/base/constant/RoleConstant.java @@ -26,11 +26,11 @@ RoleConstant { SCHOOL_UNION_WC_ADMIN("校工会工代会管理员"), SCHOOL_UNION_DC_ADMIN("校工会民主管理员"), SCHOOL_UNION_PROPOSAL_ADMIN("校工会提案管理员"), - SCHOOL_UNION_CLUB_ADMIN("校工会社团管理员"), + SCHOOL_UNION_CLUB_ADMIN("校工会协会管理员"), SCHOOL_UNION_ACTIVITY_ADMIN("校工会活动管理员"), /** 品牌活动统计、人员调整管理员，数据范围按 trainSignUp 子活动负责人关系控制。 */ SCHOOL_UNION_TRAIN_SIGN_UP_ADMIN("校工会品牌活动管理员"), - SCHOOL_UNION_ARTICLE_CLUB_ADMIN("校工会社团新闻审批管理员"), + SCHOOL_UNION_ARTICLE_CLUB_ADMIN("校工会协会新闻审批管理员"), SCHOOL_UNION_ARTICLE_FGH_ADMIN("校工会分工会新闻审批管理员"), SCHOOL_UNION_ARTICLE_ADMIN("校工会新闻审批管理员"), SCHOOL_OUTLAY_ADMIN("校工会经费管理员"), @@ -86,16 +86,16 @@ RoleConstant { SCHOOL_HOSPITAL_LEADER("校医院负责人"), - /*社团模块*/ - CLUB_MEMBER("社团会员"), - CLUB_MANAGER("社团负责人"), - CLUB_PRESIDENT("社团会长"), - CLUB_VICE_PRESIDENT("社团副会长"), - CLUB_SECRETARY("社团秘书长"), - CLUB_VICE_SECRETARY("社团副秘书长"), - // SCHOOL_UNION_CLUB_ADMIN("校工会社团管理员"), - CLUB_AUDIT_LEADER("社团分管领导"), - CLUB_OPERATOR("社团操作员"), + /*协会模块*/ + CLUB_MEMBER("协会会员"), + CLUB_MANAGER("协会负责人"), + CLUB_PRESIDENT("协会会长"), + CLUB_VICE_PRESIDENT("协会副会长"), + CLUB_SECRETARY("协会秘书长"), + CLUB_VICE_SECRETARY("协会副秘书长"), + // SCHOOL_UNION_CLUB_ADMIN("校工会协会管理员"), + CLUB_AUDIT_LEADER("协会分管领导"), + CLUB_OPERATOR("协会操作员"), /*大病基金会员*/ AID_FUND_MEMBER("大病基金会员"), @@ -111,7 +111,7 @@ RoleConstant { LEGAL_DOCTOR("法律顾问"), UNION_REIMBURSEMENT_MANAGER("分工会报销负责人"), - CLUB_REIMBURSEMENT_MANAGER("社团报销负责人"), + CLUB_REIMBURSEMENT_MANAGER("协会报销负责人"), SCHOOL_REIMBURSEMENT_MANAGER("校工会报销负责人"), ; diff --git a/src/main/java/com/budwk/app/flow/handler/FlowClubPresidentByArgsAssignmentHandler.java b/src/main/java/com/budwk/app/flow/handler/FlowClubPresidentByArgsAssignmentHandler.java index e2475e3..67b3983 100644 --- a/src/main/java/com/budwk/app/flow/handler/FlowClubPresidentByArgsAssignmentHandler.java +++ b/src/main/java/com/budwk/app/flow/handler/FlowClubPresidentByArgsAssignmentHandler.java @@ -22,7 +22,7 @@ import org.nutz.lang.util.NutMap; import java.util.List; /** - * 获取社团审批人根据流程变量参数（clubId） 必传 + * 获取协会审批人根据流程变量参数（clubId） 必传 */ public class FlowClubPresidentByArgsAssignmentHandler implements AssignmentHandler { @Override @@ -45,7 +45,7 @@ public class FlowClubPresidentByArgsAssignmentHandler implements AssignmentHandl @Override public String getMessage() { - return "获取社团会长(根据args中的clubId)"; + return "获取协会会长(根据args中的clubId)"; } @Override diff --git a/src/main/java/com/budwk/app/sys/models/Sys_user_role.java b/src/main/java/com/budwk/app/sys/models/Sys_user_role.java index 0e8420e..679ce29 100644 --- a/src/main/java/com/budwk/app/sys/models/Sys_user_role.java +++ b/src/main/java/com/budwk/app/sys/models/Sys_user_role.java @@ -61,7 +61,7 @@ public class Sys_user_role { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("社团ID") + @Comment("协会ID") private String clubId; @Column @ColDefine(type = ColType.VARCHAR, width = 32) 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 index 58fe3a3..6b02cf2 100644 --- a/src/main/java/com/budwk/app/task/job/club/ClubGeneratePayRecordJob.java +++ b/src/main/java/com/budwk/app/task/job/club/ClubGeneratePayRecordJob.java @@ -17,7 +17,7 @@ import org.quartz.JobExecutionException; * @Author JyuHsin * @Date 2026/1/22 16:56 * @Version 1.0 - * @Description 每年的1月1日生成社团成员当年的缴费记录 + * @Description 每年的1月1日生成协会成员当年的缴费记录 */ @IocBean @DisallowConcurrentExecution diff --git a/src/main/java/com/budwk/app/web/commons/auth/utils/SecurityUtil.java b/src/main/java/com/budwk/app/web/commons/auth/utils/SecurityUtil.java index 9f55e2d..3c82cce 100644 --- a/src/main/java/com/budwk/app/web/commons/auth/utils/SecurityUtil.java +++ b/src/main/java/com/budwk/app/web/commons/auth/utils/SecurityUtil.java @@ -56,7 +56,7 @@ public class SecurityUtil { } /** - * 获取当前用户社团ID + * 获取当前用户协会ID */ public static List getClubIds() { String clubIds = getSession().get("clubIds").toString(); diff --git a/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java b/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java index 9d56139..8cd91d8 100644 --- a/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java +++ b/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java @@ -115,7 +115,7 @@ public class CommonController { @At @SaCheckLogin - @ApiOperation("社团列表") + @ApiOperation("协会列表") public Result clubOptions(String clubId) { List sysClubs = sysClubService.dao().query(SysClub.class, Cnd.NEW().andEX("id", "=", clubId)); diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java index a13cb66..e7a2385 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java @@ -355,7 +355,7 @@ public class ActivityBasicScopeController { boolean isBranchUnionChairman = AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()); boolean isClubPresident = AuthUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name()); if (isBranchUnionChairman && isClubPresident) { - // 同时具备分工会主席和社团会长身份时，未额外筛选前默认查看两类权限范围的并集。 + // 同时具备分工会主席和协会会长身份时，未额外筛选前默认查看两类权限范围的并集。 List manageClubIdList = sysClubService.getMyManageClub().stream().map(SysClub::getId).toList(); SqlExpressionGroup scopeGroup = new SqlExpressionGroup(); scopeGroup.or("u.unionid", "=", SecurityUtil.getUnionId()); @@ -364,7 +364,7 @@ public class ActivityBasicScopeController { } cnd.and(scopeGroup); } else if (isClubPresident) { - // 社团会长设置活动人员范围时，只允许查看自己可管理社团下的成员。 + // 协会会长设置活动人员范围时，只允许查看自己可管理协会下的成员。 List manageClubIdList = sysClubService.getMyManageClub().stream().map(SysClub::getId).toList(); if (manageClubIdList.isEmpty()) { cnd.and("clubuser.clubid", "in", List.of("__EMPTY_CLUB_ID__")); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java index 23ea119..853fb5e 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java @@ -162,7 +162,7 @@ public class ActivityCultureUserStatisticsController { if (activity_type == 40002) { cnd.and("tissue.unionId", "=", SecurityUtil.getUnionId()); } else if (activity_type == 40003) { - // 协会会长进入社团报名统计时，只允许查看自己管理社团下的活动名称。 + // 协会会长进入协会报名统计时，只允许查看自己管理协会下的活动名称。 List myManageClub = sysClubService.getMyManageClub(); List clubIdList = myManageClub.stream().map(SysClub::getId).collect(Collectors.toList()); cnd.and("tissue.clubId", "in", clubIdList); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java index c6e99ed..427dbaa 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java @@ -19,7 +19,7 @@ import java.util.List; /** * @author: Aaron * @create: 2021-03-09 13:57 - * @description: 社团或分工会活动校工会活动 + * @description: 协会或分工会活动校工会活动 **/ @EqualsAndHashCode(callSuper = true) @@ -147,7 +147,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo private String unionId; @Column - @Comment("创建人所属社团") + @Comment("创建人所属协会") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissuePerson.java b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissuePerson.java index f8e43ad..4868c1f 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissuePerson.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissuePerson.java @@ -28,7 +28,7 @@ public class ActivityTissuePerson extends BaseModel implements Serializable { private String id; @Column - @Comment("分工会或社团活动ID") + @Comment("分工会或协会活动ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String tissueId; diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java index b9fbcdf..5ec8cbd 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java @@ -30,7 +30,7 @@ import java.util.List; */ @IocBean @Ok("json") -@ApiOperation("活动申报,社团负责人审核") +@ApiOperation("活动申报,协会负责人审核") @At("/platform/activityDeclare/clubPrincipal") public class ActivityDeclareClubPrincipalController { @@ -51,7 +51,7 @@ public class ActivityDeclareClubPrincipalController { @At - @ApiOperation("活动申报,社团负责人审核列表") + @ApiOperation("活动申报,协会负责人审核列表") @SaCheckPermission("activityDeclare.clubPrincipal") public Result pageData(CommonPageParam pageParam) { Sql sql = Sqls.create(""" 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 01ebf41..54d0158 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 @@ -222,8 +222,8 @@ public class ActivityDeclareMineController { docData.put("fgh", approval); }); - // 社团负责人审核 - doneTaskVos.stream().filter(task -> "社团负责人审核".equals(task.getDisplayName())) + // 协会负责人审核 + doneTaskVos.stream().filter(task -> "协会负责人审核".equals(task.getDisplayName())) .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) .ifPresent(v -> { Dict taskFormData = v.getTaskFormData(); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java index 5ec38b5..ff7fe64 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java @@ -58,7 +58,7 @@ public class ActivityDeclareInfo extends BaseModel { private String mobile; @Column - @Comment("申报单位（校工会/二级工会名称/社团名称）") + @Comment("申报单位（校工会/二级工会名称/协会名称）") @ColDefine(type = ColType.VARCHAR, width = 200) private String declareUnitName; @@ -68,7 +68,7 @@ public class ActivityDeclareInfo extends BaseModel { private String unionId; @Column - @Comment("社团id") + @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/enums/ActivityDeclareReimbursement.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/enums/ActivityDeclareReimbursement.java index ebbb920..6768c0c 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/enums/ActivityDeclareReimbursement.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/enums/ActivityDeclareReimbursement.java @@ -25,9 +25,9 @@ public enum ActivityDeclareReimbursement { */ BRANCH_UNION("分工会活动"), /** - * 社团 + * 协会 */ - CLUB("社团活动"); + CLUB("协会活动"); private final String typeName; } diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementBoardController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementBoardController.java index 98d018f..a94c9ec 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementBoardController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementBoardController.java @@ -110,7 +110,7 @@ public class ActivityReimbursementBoardController { list.add(new NutMap() {{ put("year", year); - put("type", "社团活动"); + put("type", "协会活动"); put("num", activityReimbursementService.count(sql.setParam("type", "ACTIVITY_BUDGET_TYPE_THREE").setParam("year", year))); }}); } @@ -145,7 +145,7 @@ public class ActivityReimbursementBoardController { put("num", activityReimbursementService.count(sql.setParam("type", "ACTIVITY_BUDGET_TYPE_TWO"))); }}); list.add(new NutMap() {{ - put("type", "社团活动"); + put("type", "协会活动"); put("num", activityReimbursementService.count(sql.setParam("type", "ACTIVITY_BUDGET_TYPE_THREE"))); }}); return Result.success(list); @@ -191,7 +191,7 @@ public class ActivityReimbursementBoardController { list.add(new NutMap() {{ put("year", year); - put("type", "社团费用"); + put("type", "协会费用"); put("num", activityReimbursementService.list(sql.setParam("type", "ACTIVITY_BUDGET_TYPE_THREE").setParam("year", year)).get(0).getDouble("money")); }}); } @@ -218,7 +218,7 @@ public class ActivityReimbursementBoardController { put("num", activityReimbursementService.count(unionSql)); }}); list.add(new NutMap() {{ - put("type", "社团费用"); + put("type", "协会费用"); put("num", activityReimbursementService.count(clubSql)); }}); return Result.success().addData(list); @@ -250,7 +250,7 @@ public class ActivityReimbursementBoardController { @At - @ApiOperation("所有社团的报销费用或活动数统计") + @ApiOperation("所有协会的报销费用或活动数统计") @SaCheckPermission("activityReimbursement.board") public Result allClubActivityAndMoney(Integer year, Boolean isClubMoney) { Sql sql = Sqls.create(""" diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementClubPrincipalController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementClubPrincipalController.java index 51e3fae..973fbe9 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementClubPrincipalController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementClubPrincipalController.java @@ -30,7 +30,7 @@ import java.util.List; */ @IocBean @Ok("json") -@ApiOperation("活动报销,社团负责人审核") +@ApiOperation("活动报销,协会负责人审核") @At("/platform/activityReimbursement/clubPrincipal") public class ActivityReimbursementClubPrincipalController { @@ -51,7 +51,7 @@ public class ActivityReimbursementClubPrincipalController { @At - @ApiOperation("活动报销,社团负责人审核列表") + @ApiOperation("活动报销,协会负责人审核列表") @SaCheckPermission("activityReimbursement.clubPrincipal") public Result pageData(CommonPageParam pageParam) { Sql sql = Sqls.create(""" diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java index cf17069..6430669 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java @@ -323,8 +323,8 @@ public class ActivityReimbursementMineController { docData.put("fgh", approval); }); - // 社团负责人审核 - doneTaskVos.stream().filter(task -> "社团负责人审核".equals(task.getDisplayName())) + // 协会负责人审核 + doneTaskVos.stream().filter(task -> "协会负责人审核".equals(task.getDisplayName())) .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) .ifPresent(v -> { Dict taskFormData = v.getTaskFormData(); diff --git a/src/main/java/com/budwk/app/zhgh/activity/planSummary/controller/YearPlanController.java b/src/main/java/com/budwk/app/zhgh/activity/planSummary/controller/YearPlanController.java index fcda1e0..a746a66 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/planSummary/controller/YearPlanController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/planSummary/controller/YearPlanController.java @@ -141,7 +141,7 @@ public class YearPlanController { } @At - @ApiOperation("获取社团") + @ApiOperation("获取协会") @SaCheckPermission("planSummary.yearPlan.manage") public Result queryClub() { Cnd cnd = Cnd.NEW(); diff --git a/src/main/java/com/budwk/app/zhgh/activity/planSummary/model/YearPlan.java b/src/main/java/com/budwk/app/zhgh/activity/planSummary/model/YearPlan.java index c9f53b1..f7a2064 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/planSummary/model/YearPlan.java +++ b/src/main/java/com/budwk/app/zhgh/activity/planSummary/model/YearPlan.java @@ -51,17 +51,17 @@ public class YearPlan extends BaseModel { private Double money; @Column - @Comment("计划类型(40001-校活动、40002-分工会活动、40003-社团社团活动)") + @Comment("计划类型(40001-校活动、40002-分工会活动、40003-协会协会活动)") @ColDefine(type = ColType.VARCHAR, width = 7) private String planType; @Column - @Comment("分工会ID或社团ID") + @Comment("分工会ID或协会ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String tissueId; @Column - @Comment("分工会或社团") + @Comment("分工会或协会") @ColDefine(type = ColType.VARCHAR, width = 32) private String tissueName; diff --git a/src/main/java/com/budwk/app/zhgh/activity/planSummary/model/YearSummary.java b/src/main/java/com/budwk/app/zhgh/activity/planSummary/model/YearSummary.java index 91c9f66..9b191f4 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/planSummary/model/YearSummary.java +++ b/src/main/java/com/budwk/app/zhgh/activity/planSummary/model/YearSummary.java @@ -72,12 +72,12 @@ public class YearSummary extends BaseModel { private String cTime; @Column - @Comment("工会/社团id") + @Comment("工会/协会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String tissueId; @Column - @Comment("分工会或社团") + @Comment("分工会或协会") @ColDefine(type = ColType.VARCHAR, width = 32) private String tissueName; @@ -87,7 +87,7 @@ public class YearSummary extends BaseModel { private String summaryType; @Column - @Comment("总结来源（1-校活动、2-分工会活动、3社团社团活动）") + @Comment("总结来源（1-校活动、2-分工会活动、3协会协会活动）") @ColDefine(type = ColType.VARCHAR, width = 32) private String summaryFrom; diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java index 1e1c1b6..3ba6a15 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java @@ -162,7 +162,7 @@ public class ActivitySchool extends BaseModel implements Serializable , SysHomeC private Boolean close; @Column - @Comment("活动级别（40001-校级、40002-分工会、40003-社团或社团）") + @Comment("活动级别（40001-校级、40002-分工会、40003-协会或协会）") @ColDefine(type = ColType.INT, width = 10) private Integer activityLevel; @@ -198,7 +198,7 @@ public class ActivitySchool extends BaseModel implements Serializable , SysHomeC private String belongUnionId; @Column - @Comment("活动所属社团") + @Comment("活动所属协会") @ColDefine(type = ColType.VARCHAR, width = 32) private String belongClubId; diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpManageController.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpManageController.java index e69a6cd..bc2e1b7 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpManageController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpManageController.java @@ -326,7 +326,7 @@ public class TrainSignUpManageController { @At @Ok("json:full") - @ApiOperation("查询分工会和社团") + @ApiOperation("查询分工会和协会") @SaCheckPermission(value = {"trainSignUp.manage", "trainSignUp.applyActivity"}, mode = SaMode.OR) public Result selectUnitAndClub() { List result = new ArrayList<>(); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserClubListController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserClubListController.java index 6524ede..7a65bdd 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserClubListController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserClubListController.java @@ -49,9 +49,9 @@ public class ClubUserClubListController { } /** - * 打开移动端社团列表，共用电脑端的社团查询及入退会状态。 + * 打开移动端协会列表，共用电脑端的协会查询及入退会状态。 * - * @return 无返回值，由模板渲染社团列表页面 + * @return 无返回值，由模板渲染协会列表页面 */ @At("/h5") @Ok("beetl:/platform/zhghh5/club/list/index.html") @@ -85,7 +85,7 @@ public class ClubUserClubListController { @At @SaCheckPermission(value = {"club.join.list", "h5.club.join.list", "h5.club.join.apply"}, mode = SaMode.OR) public Result getCount() { - // 获取所有社团 + // 获取所有协会 List list = sysClubService.query(); // 获取审核通过的 List instanceList = sysClubService.dao().query( 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 90629d4..4470296 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 @@ -51,7 +51,7 @@ import java.util.List; @IocBean @At("/platform/club/join/apply") -@Api("社团申请入会、退会") +@Api("协会申请入会、退会") @Ok("json:full") public class ClubUserJoinApplyController { @@ -75,12 +75,12 @@ public class ClubUserJoinApplyController { } /** - * 移动端首次入会先选择社团，已选社团或已有申请继续进入申请表单。 + * 移动端首次入会先选择协会，已选协会或已有申请继续进入申请表单。 * - * @param clubId 已选择的社团ID + * @param clubId 已选择的协会ID * @param bizId 已有入会申请ID * @param taskId 重新提交申请时的流程任务ID - * @return 无申请上下文时跳转社团列表，否则渲染原申请页面 + * @return 无申请上下文时跳转协会列表，否则渲染原申请页面 */ @At("/h5") @SaCheckPermission("h5.club.join.apply") @@ -124,7 +124,7 @@ public class ClubUserJoinApplyController { @ApiOperation("保存申请") @Aop(TransAop.READ_COMMITTED) @SaCheckPermission(value = {"club.join.apply", "h5.club.join.apply"}, mode = SaMode.OR) - @SLog(tag = "社团管理系统-申请入会", msg = "保存社团入会") + @SLog(tag = "协会管理系统-申请入会", msg = "保存协会入会") public Result save(@Param("data") ClubUserApply clubUserApply) { clubUserApply.setRoleCode(RoleConstant.CLUB_MEMBER.name()); clubUserApply.setMode(1); @@ -138,7 +138,7 @@ public class ClubUserJoinApplyController { @ApiOperation("提交") @SaCheckPermission(value = {"club.join.apply", "h5.club.join.apply"}, mode = SaMode.OR) @Aop(TransAop.READ_COMMITTED) - @SLog(tag = "社团管理系统-申请入/退会", msg = "申请社团入/退会") + @SLog(tag = "协会管理系统-申请入/退会", msg = "申请协会入/退会") public Result submit(@Param("data") ClubUserApply clubUserApply, @Param("mode") Boolean mode) { if (Boolean.TRUE.equals(mode)) { @@ -150,14 +150,14 @@ public class ClubUserJoinApplyController { if(mode == false) { clubUserApply = clubUserJoinService.buildExitApply(clubUserApply.getClubId(), SecurityUtil.getUserId()); if (ObjectUtil.isEmpty(clubUserApply)) { - return Result.error("当前不是该社团成员，无法申请退出！"); + return Result.error("当前不是该协会成员，无法申请退出！"); } } 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 (processInstance != null && !List.of(ProcessInstanceStateEnum.REJECT.getCode(), ProcessInstanceStateEnum.FINISHED.getCode()).contains(processInstance.getState())) { - return Result.error("您有该社团的申请记录尚未完成，请到我的申请里查看！"); + return Result.error("您有该协会的申请记录尚未完成，请到我的申请里查看！"); } } @@ -209,7 +209,7 @@ public class ClubUserJoinApplyController { } @At - @ApiOperation("校验是否申请过社团") + @ApiOperation("校验是否申请过协会") @SaCheckPermission(value = {"club.join.apply", "h5.club.join.apply"}, mode = SaMode.OR) public Result checkApplyClub(@Valid String clubId) { String qualificationMsg = clubUserJoinService.checkJoinQualification(SecurityUtil.getUserId()); @@ -234,10 +234,10 @@ public class ClubUserJoinApplyController { ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", userApply.getId())); // 申请记录存在但没有流程实例时，说明用户仅保存了申请草稿，需提示其先到“我的申请”继续提交。 if (processInstance == null) { - return Result.error(99, "您有该社团的申请记录尚未提交，请到我的申请里查看！"); + return Result.error(99, "您有该协会的申请记录尚未提交，请到我的申请里查看！"); } if (!List.of(ProcessInstanceStateEnum.REJECT.getCode(), ProcessInstanceStateEnum.FINISHED.getCode()).contains(processInstance.getState())) { - return Result.error(99, "您有该社团的申请记录尚未完成，请到我的申请里查看！"); + 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 31d02d1..2f86375 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 @@ -59,8 +59,8 @@ public class ClubUserJoinMineController { @SaCheckPermission(value = {"club.join.mine", "h5.club.join.mine"}, mode = SaMode.OR) /** * 我的申请分页查询。 - * pageForm 为分页参数，year 为申请年度，clubName 为可选的社团名称关键字； - * 返回分页后的当前用户社团申请记录。 + * pageForm 为分页参数，year 为申请年度，clubName 为可选的协会名称关键字； + * 返回分页后的当前用户协会申请记录。 */ public Result pageData(@Valid PageForm pageForm, @Param("year") Integer year, @@ -135,7 +135,7 @@ public class ClubUserJoinMineController { @SaCheckPermission(value = {"club.join.mine", "h5.club.join.mine"}, mode = SaMode.OR) @ApiOperation("删除") @Aop(TransAop.READ_COMMITTED) - @SLog(tag = "社团管理系统-申请入会-我的申请", msg = "删除社团入会") + @SLog(tag = "协会管理系统-申请入会-我的申请", msg = "删除协会入会") public Result delete(@Valid String id) { dao.delete(ClubUserApply.class, id); dao.delete(ClubUser.class, id); 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 804d512..5e0a12d 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 @@ -51,8 +51,8 @@ public class ClubUserMineClubController { @At @SaCheckPermission(value = {"club.join.mine.club", "h5.club.join.mine.club"}, mode = SaMode.OR) /** - * 我的社团分页查询。 - * pageForm 传入分页参数及可选社团名称；返回当前登录人已完成入会流程的社团列表， + * 我的协会分页查询。 + * pageForm 传入分页参数及可选协会名称；返回当前登录人已完成入会流程的协会列表， * 每条记录同时包含当前成员姓名、工号和最近一次入会申请 ID，供 H5 卡片及详情页展示。 */ public Result pageData(@Valid ClubUserPageForm pageForm) { @@ -79,7 +79,7 @@ public class ClubUserMineClubController { FROM sys_club club LEFT JOIN club_user uc ON club.id = uc.clubId - -- 查询当前登录人的成员资料及最近一次入会申请，避免卡片标题错误显示为社团名称。 + -- 查询当前登录人的成员资料及最近一次入会申请，避免卡片标题错误显示为协会名称。 LEFT JOIN club_user currentClubUser ON currentClubUser.clubId = club.id AND currentClubUser.userId = @currentUserId LEFT JOIN sys_user currentUser ON currentUser.id = currentClubUser.userId LEFT JOIN ( @@ -97,7 +97,7 @@ public class ClubUserMineClubController { """); sql.setParam("currentUserId", SecurityUtil.getUserId()); Cnd cnd = Cnd.NEW(); - // 社团名称为可选搜索参数，输入关键字时按名称模糊匹配。 + // 协会名称为可选搜索参数，输入关键字时按名称模糊匹配。 if (Strings.isNotBlank(pageForm.getClubName())) { cnd.and("club.clubName", "like", "%" + pageForm.getClubName().trim() + "%"); } diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java b/src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java index 3b9ae89..3206ff1 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java @@ -52,7 +52,7 @@ public class ClubCommonController { private SysFileService sysFileService; /** - * 上传社团缩略图，限制图片大小并复用系统文件服务校验图片内容及保存文件。 + * 上传协会缩略图，限制图片大小并复用系统文件服务校验图片内容及保存文件。 * * @param file 用户上传的 JPG、PNG 或 GIF 图片，大小不得超过 2MB * @return 成功时返回图片下载地址，文件无效或超过限制时返回错误提示 @@ -63,14 +63,14 @@ public class ClubCommonController { @SaCheckPermission(value = {"club.register.apply", "club.infoManage.manage"}, mode = SaMode.OR) public Result uploadThumbnail(@Param("file") TempFile file) { if (file == null || StrUtil.isBlank(file.getSubmittedFileName())) { - return Result.error("请选择社团缩略图"); + return Result.error("请选择协会缩略图"); } if (file.getSize() > 2L * 1024 * 1024) { - return Result.error("社团缩略图大小不能超过2MB"); + return Result.error("协会缩略图大小不能超过2MB"); } String suffix = FileUtil.extName(file.getSubmittedFileName()).toLowerCase(Locale.ROOT); if (!Set.of("jpg", "jpeg", "png", "gif").contains(suffix)) { - return Result.error("社团缩略图仅支持JPG、PNG、GIF图片"); + return Result.error("协会缩略图仅支持JPG、PNG、GIF图片"); } try { return Result.success().addData(sysFileService.uploadReturnUrl(SysFileEngineTypeEnum.MINIO.getValue(), file)); @@ -81,7 +81,7 @@ public class ClubCommonController { @At @SaCheckLogin - /** 无请求参数；返回入会社团选项，每项包含 id、clubName 等社团字段，同一社团不重复。 */ + /** 无请求参数；返回入会协会选项，每项包含 id、clubName 等协会字段，同一协会不重复。 */ public Result listClub() { return Result.success(sysClubService.listJoinClubOptions()); } @@ -114,7 +114,7 @@ public class ClubCommonController { @At @SaCheckLogin public Result listManageClubByRole() { - // 活动人员范围设置只允许按“可管理的社团”选择，避免把仅作为成员加入的社团也展示出来。 + // 活动人员范围设置只允许按“可管理的协会”选择，避免把仅作为成员加入的协会也展示出来。 List clubList = sysClubService.getMyManageClub(); return Result.success(clubList); } diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateApplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateApplyController.java index 3f3bf55..3999471 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateApplyController.java @@ -69,7 +69,7 @@ public class ClubEvaluateApplyController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.evaluate.apply") - @SLog(tag = "社团管理系统-社团评优", msg = "保存社团评优申请") + @SLog(tag = "协会管理系统-协会评优", msg = "保存协会评优申请") public Result save(@Param("data") SysClubEvaluate evaluate) { evaluateService.dao().insertOrUpdate(evaluate); return Result.success(evaluate); @@ -78,7 +78,7 @@ public class ClubEvaluateApplyController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.evaluate.apply") - @SLog(tag = "社团管理系统-社团评优", msg = "提交社团评优") + @SLog(tag = "协会管理系统-协会评优", msg = "提交协会评优") public Result submit(@Valid @Param("data") SysClubEvaluate evaluate) { evaluateService.dao().insertOrUpdate(evaluate); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateMineController.java b/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateMineController.java index a565ffe..b6c093e 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateMineController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateMineController.java @@ -51,7 +51,7 @@ public class ClubEvaluateMineController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.evaluate.mine") - @SLog(tag = "社团管理系统-社团评优", msg = "删除社团评优") + @SLog(tag = "协会管理系统-协会评优", msg = "删除协会评优") public Result doDelete(@Valid String id) { sysClubEvaluateService.dao().delete(SysClubEvaluate.class, id); flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineApplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineApplyController.java index 85d0211..62e054a 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineApplyController.java @@ -71,12 +71,12 @@ public class ClubExamineApplyController { @SaCheckLogin public Result getCount(String id, Integer year, String clubId) { if(StrUtil.isBlank(clubId)) { - return Result.error("社团信息为空，请核查"); + return Result.error("协会信息为空，请核查"); } if(year == null) { return Result.error("年份信息为空，请核查"); } - // 同一社团的年度重复申请校验以登记年度为准，不能按申请时间判断。 + // 同一协会的年度重复申请校验以登记年度为准，不能按申请时间判断。 List list = dao.query(SysClubExamineRegister.class, Cnd.where("clubId", "=", clubId).and("year", "=", year).andEX("id", "!=", id)); List instanceList = dao.query( ProcessInstance.class, @@ -98,7 +98,7 @@ public class ClubExamineApplyController { // @SaCheckLogin // public Result getClubUserNum(String clubId, Integer year) { // if(StrUtil.isBlank(clubId)) { -// return Result.error("社团信息为空，请核查"); +// return Result.error("协会信息为空，请核查"); // } // List result = sysClubExamineService.getClubUserNum(clubId, year); // return Result.success(result); @@ -107,13 +107,13 @@ public class ClubExamineApplyController { // /** * 2026年10月2日22：00点开始新开发的代码；实际整改：2026年10月3日 10:14:04；操作人：wxg。 - * 接收 clubId（所选社团ID）、year（公历年度），基础校验后调用 service； + * 接收 clubId（所选协会ID）、year（公历年度），基础校验后调用 service； * 返回 Result，data为两类计数及统计核查信息列表，异常参数返回错误提示。 */ @At @SaCheckLogin public Result getClubUserNum(String clubId, Integer year) { - if (StrUtil.isBlank(clubId)) return Result.error("社团信息为空，请核查"); + if (StrUtil.isBlank(clubId)) return Result.error("协会信息为空，请核查"); if (year == null || year < 1 || year > 9998) return Result.error("请选择有效统计年度"); return Result.success(sysClubExamineService.getClubUserNum(clubId, year)); } @@ -122,7 +122,7 @@ public class ClubExamineApplyController { @SaCheckLogin public Result getJgUser(String clubId) { if(StrUtil.isBlank(clubId)) { - return Result.error("社团信息为空，请核查"); + return Result.error("协会信息为空，请核查"); } List result = sysClubExamineService.getJgUser(clubId); return Result.success(result); @@ -132,7 +132,7 @@ public class ClubExamineApplyController { @SaCheckLogin public Result getClubMemberMoney(String clubId) { if(StrUtil.isBlank(clubId)) { - return Result.error("社团信息为空，请核查"); + return Result.error("协会信息为空，请核查"); } int count = dao.count(ClubUser.class, Cnd.where("clubId", "=", clubId)); SysClub club = dao.fetch(SysClub.class, clubId); @@ -160,7 +160,7 @@ public class ClubExamineApplyController { @SaCheckLogin public Result getLastYearSurplus(String clubId) { if(StrUtil.isBlank(clubId)) { - return Result.error("社团信息为空，请核查"); + return Result.error("协会信息为空，请核查"); } // 上年度结余按登记年度查询，避免申请时间跨年导致取错数据。 SysClubExamineRegister register = dao.fetch(SysClubExamineRegister.class, Cnd.where("clubId", "=", clubId) @@ -186,7 +186,7 @@ public class ClubExamineApplyController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.examine.apply") - @SLog(tag = "社团管理系统-社团年审", msg = "保存社团年审") + @SLog(tag = "协会管理系统-协会年审", msg = "保存协会年审") public Result save(@Param("data") SysClubExamineRegister examineRegister, @Param("incomeDetailed") String incomeDetailed, @Param("incomeCensus") String incomeCensus) { @@ -201,7 +201,7 @@ public class ClubExamineApplyController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.examine.apply") - @SLog(tag = "社团管理系统-社团年审", msg = "提交社团年审") + @SLog(tag = "协会管理系统-协会年审", msg = "提交协会年审") public Result submit(@Param("data") SysClubExamineRegister examineRegister, @Param("incomeDetailed") String incomeDetailed, @Param("incomeCensus") String incomeCensus) { diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineMineController.java b/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineMineController.java index 045c156..5f3e954 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineMineController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineMineController.java @@ -48,7 +48,7 @@ public class ClubExamineMineController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.examine.mine") - @SLog(tag = "社团管理系统-社团年审", msg = "删除社团年审") + @SLog(tag = "协会管理系统-协会年审", msg = "删除协会年审") public Result doDelete(@Valid String id) { sysClubExamineService.delete(id); sysClubExamineService.dao().clear(SysClubExamineRegisterDetailed.class, Cnd.where("registerId", "=", id)); @@ -108,7 +108,7 @@ public class ClubExamineMineController { .bind("activityQk", activityQk).build(); try { - String fileName = Globals.MyConfig.getString("AppName") + "教职工社团年度考核登记表"; + String fileName = Globals.MyConfig.getString("AppName") + "教职工协会年度考核登记表"; response.addHeader("Content-Type", "application/octet-stream"); response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1) + "\".docx"); XWPFTemplate.compile(officeTemplateUtil.getPath("club_examine_register"), config).render(map).writeAndClose(response.getOutputStream()); 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 83fadd0..3f7c3bb 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 @@ -135,7 +135,7 @@ public class ClubChangeManagerController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.change") - @SLog(tag = "社团管理系统-信息管理", msg = "提交变更理事机构") + @SLog(tag = "协会管理系统-信息管理", msg = "提交变更理事机构") public Object submit(@Param("data") SysClubManager clubManager) { Cnd cnd = Cnd.NEW(); cnd.and(SysClubManager::getClubId, "=", clubManager.getClubId()); @@ -146,7 +146,7 @@ public class ClubChangeManagerController { List pendingProcessIds = managerList.stream().map(SysClubManager::getId).toList(); int pendingCount = dao.count(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", pendingProcessIds).and(ProcessInstance::getState, "not in", List.of(ProcessInstanceStateEnum.FINISHED.getCode(), ProcessInstanceStateEnum.REJECT.getCode()))); if (pendingCount > 0) { - return Result.error("您有该社团的申请记录尚未完成，请核对！"); + return Result.error("您有该协会的申请记录尚未完成，请核对！"); } if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { @@ -206,7 +206,7 @@ public class ClubChangeManagerController { @ApiOperation("删除") @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.change") - @SLog(tag = "社团管理系统-信息管理", msg = "删除变更理事机构") + @SLog(tag = "协会管理系统-信息管理", msg = "删除变更理事机构") public Result delete(@Param("id") String id) { dao.delete(SysClubManager.class, id); flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java index 85fe665..0642ab6 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java @@ -111,7 +111,7 @@ public class ClubInfoManageController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.manage") - @SLog(tag = "社团管理系统-信息管理", msg = "修改社团信息") + @SLog(tag = "协会管理系统-信息管理", msg = "修改协会信息") public Result doSubmit(@Param("club") SysClub club) { clubInfoManageService.dao().update(club); return Result.success(); @@ -120,7 +120,7 @@ public class ClubInfoManageController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.manage") - @SLog(tag = "社团管理系统-信息管理", msg = "修改缴费状态") + @SLog(tag = "协会管理系统-信息管理", msg = "修改缴费状态") public Result updatePayed(@Valid Boolean payed, @Valid String id) { clubInfoManageService.dao().update(ClubUser.class, Chain.make("payed", payed), Cnd.where("id", "=", id)); return Result.success(); @@ -129,7 +129,7 @@ public class ClubInfoManageController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.manage") - @SLog(tag = "社团管理系统-信息管理", msg = "修改拨付状态") + @SLog(tag = "协会管理系统-信息管理", msg = "修改拨付状态") public Result updateGive(@Valid Boolean giveMoney, @Valid String id) { clubInfoManageService.dao().update(ClubUser.class, Chain.make("giveMoney", giveMoney), Cnd.where("id", "=", id)); return Result.success(); @@ -138,7 +138,7 @@ public class ClubInfoManageController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.manage") - @SLog(tag = "社团管理系统-信息管理", msg = "退会") + @SLog(tag = "协会管理系统-信息管理", msg = "退会") public Result exitClub(@Valid String id) { clubInfoManageService.exitClub(id); return Result.success(); @@ -147,7 +147,7 @@ public class ClubInfoManageController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.manage") - @SLog(tag = "社团管理系统-信息管理", msg = "删除社团成员") + @SLog(tag = "协会管理系统-信息管理", msg = "删除协会成员") public Result userDelete(@Valid String id) { ClubUser clubUser = dao.fetch(ClubUser.class, id); dao.delete(ClubUser.class,id); @@ -188,11 +188,11 @@ public class ClubInfoManageController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.manage") - @SLog(tag = "社团管理系统-信息管理", msg = "修改身份") + @SLog(tag = "协会管理系统-信息管理", msg = "修改身份") public Result updateRoleCode(@Param("id") String id, @Valid String[] roleCodes, @Valid String clubId) { List roleCodeList = Arrays.asList(roleCodes); ClubUser clubUser = clubInfoManageService.dao().fetch(ClubUser.class, id); - //查询社团是否存在会长或者秘书长 + //查询协会是否存在会长或者秘书长 if(Arrays.asList(roleCodes).contains(RoleConstant.CLUB_PRESIDENT.name())) { int count = dao.count(ClubUser.class, Cnd.where("clubId", "=", clubId) .and(new Static("JSON_CONTAINS(roleCode, '\"%s\"')".formatted(RoleConstant.CLUB_PRESIDENT.name())))); @@ -265,10 +265,10 @@ public class ClubInfoManageController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.manage") - @SLog(tag = "社团管理系统-信息管理", msg = "添加社团成员") + @SLog(tag = "协会管理系统-信息管理", msg = "添加协会成员") public Result userDoAdd(@Valid String clubId, @Valid String[] users, @Valid String roleCode, @Valid Boolean payed) { - //查询社团是否存在会长或者秘书长 + //查询协会是否存在会长或者秘书长 if (List.of(RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name()).contains(roleCode)) { int count = clubInfoManageService.dao().count(ClubUser.class, Cnd.where("clubId", "=", clubId) .and(new Static("JSON_CONTAINS(roleCode, '\"%s\"')".formatted(roleCode)))); @@ -354,7 +354,7 @@ public class ClubInfoManageController { } /** - * @param clubId 左侧选中的社团ID，用于导出该社团登记表 + * @param clubId 左侧选中的协会ID，用于导出该协会登记表 * @param response 成功时写入 DOCX 附件；失败由统一异常处理返回含 code/msg 的错误结果 * @return void，附件直接写入响应，不再渲染 JSON 成功结果 */ @@ -372,9 +372,9 @@ public class ClubInfoManageController { public void downloadUserImport(HttpServletResponse response) { try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();){ EasyExcel.write(byteArrayOutputStream, ClubUserImportVo.class) - .sheet("社团会员导入模版") + .sheet("协会会员导入模版") .doWrite(ArrayList::new); - CommonDownloadUtil.download("社团会员导入模版.xlsx", byteArrayOutputStream.toByteArray() ,response); + CommonDownloadUtil.download("协会会员导入模版.xlsx", byteArrayOutputStream.toByteArray() ,response); } catch (Exception e) { e.printStackTrace(); } @@ -405,7 +405,7 @@ public class ClubInfoManageController { continue; } if (clubUsers.stream().anyMatch(s -> s.getUserId().equals(user.getId()))) { - v.setErrorInfo("该用户已加入该社团"); + v.setErrorInfo("该用户已加入该协会"); errorInfos.add(v); continue; } 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 9f1b05d..a14e268 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 @@ -28,7 +28,7 @@ import javax.validation.Valid; @Slf4j @IocBean @Ok("json:full") -@Api(tags = "社团缴费记录") +@Api(tags = "协会缴费记录") @At("/platform/club/pay") public class ClubPayRecordController { @@ -46,7 +46,7 @@ public class ClubPayRecordController { @SaCheckPermission("club.infoManage.pay") /** * 2026年10月3日 14:33:18；操作人：wxg：接收查询条件，业务筛选交给 service。 - * pageForm 为分页和姓名/工号关键字；year 为年度、clubId 为社团ID； + * pageForm 为分页和姓名/工号关键字；year 为年度、clubId 为协会ID； * payed/assign 为缴费/拨付状态（1是、0否、空值不限）；memberState 为当前会员状态（1在会、0退会、空值全部）。 * 返回 Result，data 为分页对象，包含 list、totalCount 等；list.count 为当前会员关系是否存在（1在会、0退会）。 */ @@ -62,7 +62,7 @@ public class ClubPayRecordController { return Result.success(payRecordService.pageData(pageForm, year, clubId, payed, assign, memberState)); } - /** 返回当前用户授权社团的下拉选项，字段包含 id、clubName、clubCode。 */ + /** 返回当前用户授权协会的下拉选项，字段包含 id、clubName、clubCode。 */ @At @SaCheckPermission("club.infoManage.pay") public Result listClubs() { @@ -70,9 +70,9 @@ public class ClubPayRecordController { } @At - @ApiOperation("修改社团成员缴费状态") + @ApiOperation("修改协会成员缴费状态") @SaCheckPermission("club.infoManage.pay") - @SLog(tag = "社团管理系统-缴费记录", msg = "修改社团成员缴费状态") + @SLog(tag = "协会管理系统-缴费记录", msg = "修改协会成员缴费状态") @Aop(TransAop.READ_COMMITTED) public Result handle(@Param("ids") String[] ids, @Param("payed") Boolean payed) { diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java index 57cb039..83a18ed 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java @@ -124,7 +124,7 @@ public class ClubRefreshReportController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.refreshReport") - @SLog(tag = "社团管理系统-信息管理", msg = "提交换届报告") + @SLog(tag = "协会管理系统-信息管理", msg = "提交换届报告") public Object submit(@Param("data") SysClubRefresh clubRefresh) { Cnd cnd = Cnd.NEW(); @@ -136,7 +136,7 @@ public class ClubRefreshReportController { List idList = list.stream().map(SysClubRefresh::getId).toList(); int count = dao.count(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", idList).and(ProcessInstance::getState, "not in", List.of(ProcessInstanceStateEnum.FINISHED.getCode(), ProcessInstanceStateEnum.REJECT.getCode()))); if (count > 0) { - return Result.error("您有该社团的申请记录尚未完成，请核对！"); + return Result.error("您有该协会的申请记录尚未完成，请核对！"); } SysClub club = clubInfoManageService.dao().fetch(SysClub.class, clubRefresh.getClubId()); @@ -178,9 +178,9 @@ public class ClubRefreshReportController { @ApiOperation("删除") @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.refreshReport") - @SLog(tag = "社团管理系统-信息管理", msg = "删除换届报告") + @SLog(tag = "协会管理系统-信息管理", msg = "删除换届报告") public Result delete(@Param("id") String id) { - // 历史换届记录可能与社团注册共用业务编号，必须按流程定义精确定位换届流程，避免误删注册流程。 + // 历史换届记录可能与协会注册共用业务编号，必须按流程定义精确定位换届流程，避免误删注册流程。 List refreshDefineIds = dao.query(ProcessDefine.class, Cnd.where(ProcessDefine::getName, "=", "XHHJBG")) .stream() diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRegisterImportController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRegisterImportController.java index 1cf8ff4..15ec092 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRegisterImportController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRegisterImportController.java @@ -32,9 +32,9 @@ import java.util.List; @At("/platform/club/infoManage/registerImport") @Ok("json:full") public class ClubRegisterImportController { - private static final String[] HEADERS = {"社团名称", "社团编码（选填）", "社团类型编码", "成立日期", "会长工号", "秘书长工号", + private static final String[] HEADERS = {"协会名称", "协会编码（选填）", "协会类型编码", "成立日期", "会长工号", "秘书长工号", "发起人工号", "副会长工号（选填）", "副秘书长工号（选填）", "联系人工号（选填）", "会费标准（选填）", - "联系电话（选填）", "联系邮箱（选填）", "社团介绍及宗旨（选填）", "活动形式（选填）", "缩略图地址（选填）", + "联系电话（选填）", "联系邮箱（选填）", "协会介绍及宗旨（选填）", "活动形式（选填）", "缩略图地址（选填）", "申请成立报告文件ID（选填）", "章程草案文件ID（选填）", "经费管理办法文件ID（选填）", "年度计划文件ID（选填）", "其他附件文件ID（选填）"}; @Inject private ClubRegisterImportService clubRegisterImportService; @@ -47,27 +47,27 @@ public class ClubRegisterImportController { @SaCheckPermission("club.infoManage.manage") public void downloadTemplate(HttpServletResponse response) { Workbook workbook = new XSSFWorkbook(); - Sheet data = sheet(workbook, "社团导入", HEADERS); + Sheet data = sheet(workbook, "协会导入", HEADERS); CellStyle style = workbook.createCellStyle(); style.setDataFormat(workbook.createDataFormat().getFormat("@")); for (int i = 0; i < HEADERS.length; i++) data.setDefaultColumnStyle(i, style); Sheet notes = sheet(workbook, "填写说明", "参数", "填写要求"); notes.setColumnWidth(1, 100 * 256); - append(notes, "导入规则", "仅读取第一个工作表，每行一个社团，最多1000行有效数据；保留表头，工号与编码按文本填写。"); - append(notes, "必填", "社团名称、社团类型编码、成立日期、会长工号、秘书长工号、至少3名不同发起人工号。"); - append(notes, "社团编码", "选填，留空按单个注册的年度编号规则生成；已有名称或编码直接跳过，不覆盖草稿、审批中或已解散记录。"); + append(notes, "导入规则", "仅读取第一个工作表，每行一个协会，最多1000行有效数据；保留表头，工号与编码按文本填写。"); + append(notes, "必填", "协会名称、协会类型编码、成立日期、会长工号、秘书长工号、至少3名不同发起人工号。"); + append(notes, "协会编码", "选填，留空按单个注册的年度编号规则生成；已有名称或编码直接跳过，不覆盖草稿、审批中或已解散记录。"); append(notes, "成立日期", "按yyyy-MM-dd填写，如2026-10-23；支持Excel日期单元格。"); append(notes, "人员", "使用系统内已有工号。会长和秘书长各1人；副职可选多人，用逗号分隔，理事机构人员不得重复。"); append(notes, "发起人", "至少3名不同人员，用逗号分隔；可与理事机构人员重合。"); append(notes, "联系人", "选填工号，电话及邮箱默认取人员资料；单独填写电话、邮箱时使用填写值。"); - append(notes, "社团类型", "参照社团类型工作表填写编码，不填写名称。"); + append(notes, "协会类型", "参照协会类型工作表填写编码，不填写名称。"); append(notes, "其他资料", "会费标准、介绍、活动形式、缩略图地址均选填；介绍及活动形式按纯文本导入。"); append(notes, "附件", "选填系统已上传文件的ID，多文件用逗号分隔，每类最多5个；Excel不上传附件本身，留空可后续在维护页面补充。"); - append(notes, "直接通过", "保存社团、发起人、理事会员、入会时间和年度缴费记录，授予社团角色；直接通过，不生成审批任务。"); + append(notes, "直接通过", "保存协会、发起人、理事会员、入会时间和年度缴费记录，授予协会角色；直接通过，不生成审批任务。"); append(notes, "导入结果", "逐行独立保存，已存在的跳过，失败行回滚并显示原因，不影响其他行。"); - Sheet types = sheet(workbook, "社团类型", "类型编码", "类型名称"); + Sheet types = sheet(workbook, "协会类型", "类型编码", "类型名称"); for (Sys_dict type : sysDictService.getSubListByCode("CLUB_REGISTER_TYPE")) append(types, type.getCode(), type.getName()); - CommonDownloadUtil.download("社团批量注册模板.xlsx", workbook, response); + CommonDownloadUtil.download("协会批量注册模板.xlsx", workbook, response); } @At @@ -95,7 +95,7 @@ public class ClubRegisterImportController { numbers.add(row.getRowNum() + 1); } } catch (Exception e) { - log.warn("读取社团注册导入文件失败", e); + log.warn("读取协会注册导入文件失败", e); return Result.error("文件读取失败，请使用未加密的xls或xlsx模板，不要使用公式"); } if (rows.isEmpty()) return Result.error("文件中没有需要导入的数据"); @@ -110,7 +110,7 @@ public class ClubRegisterImportController { } catch (IllegalArgumentException e) { result = NutMap.NEW().addv("status", "失败").addv("message", e.getMessage()); } catch (Exception e) { - log.error("社团批量注册失败，行号：{}", numbers.get(i), e); + log.error("协会批量注册失败，行号：{}", numbers.get(i), e); result = NutMap.NEW().addv("status", "失败").addv("message", "保存失败，该行已回滚，请检查数据或联系管理员"); } result.setv("rowNumber", numbers.get(i)).setv("clubName", values[0]); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java index b0a7395..b571761 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java @@ -123,7 +123,7 @@ public class ClubRuleUpdateController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.ruleUpdate") - @SLog(tag = "社团管理系统-信息管理", msg = "提交章程备案") + @SLog(tag = "协会管理系统-信息管理", msg = "提交章程备案") public Object submit(@Param("data")SysClubRule clubRule) { Cnd cnd = Cnd.NEW(); @@ -135,7 +135,7 @@ public class ClubRuleUpdateController { List idList = list.stream().map(SysClubRule::getId).toList(); int count = dao.count(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", idList).and(ProcessInstance::getState, "not in", List.of(ProcessInstanceStateEnum.FINISHED.getCode(), ProcessInstanceStateEnum.REJECT.getCode()))); if (count > 0) { - return Result.error("您有该社团的申请记录尚未完成，请核对！"); + return Result.error("您有该协会的申请记录尚未完成，请核对！"); } SysClub club = clubInfoManageService.dao().fetch(SysClub.class, clubRule.getClubId()); @@ -177,7 +177,7 @@ public class ClubRuleUpdateController { @ApiOperation("删除") @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.infoManage.ruleUpdate") - @SLog(tag = "社团管理系统-信息管理", msg = "删除章程备案") + @SLog(tag = "协会管理系统-信息管理", msg = "删除章程备案") public Result delete(@Param("id") String id) { clubInfoManageService.dao().delete(SysClubRule.class, id); flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubSchoolAuditReportController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubSchoolAuditReportController.java index 99110ba..2f627f9 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubSchoolAuditReportController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubSchoolAuditReportController.java @@ -201,7 +201,7 @@ public class ClubSchoolAuditReportController { } /** - * 使用社团名称建立目录，方便按换届报告来源查阅。 + * 使用协会名称建立目录，方便按换届报告来源查阅。 * * @param report 换届报告记录 * @return Zip 内目录名称 @@ -211,7 +211,7 @@ public class ClubSchoolAuditReportController { } /** - * 保留附件原始文件名；同一社团目录存在同名文件时追加序号，避免覆盖。 + * 保留附件原始文件名；同一协会目录存在同名文件时追加序号，避免覆盖。 * * @param entryName 原始 Zip 条目名称 * @param entryNames 已写入的 Zip 条目名称 diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubConfirmController.java b/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubConfirmController.java index c1ff72d..63399d5 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubConfirmController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubConfirmController.java @@ -22,7 +22,7 @@ import javax.validation.Valid; * @Author: JyuHsin * @Date: 2024/8/6 10:02 * @Version: v1.0.0 - * @Description: 社团确认 + * @Description: 协会确认 **/ @IocBean @Ok("json") diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubMyApplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubMyApplyController.java index d10c4b1..64c6e3c 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubMyApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubMyApplyController.java @@ -31,7 +31,7 @@ import javax.validation.Valid; **/ @IocBean @Ok("json") -@Api("社团-我的注册") +@Api("协会-我的注册") @At("/platform/club/register/clubMyApply") public class ClubMyApplyController { @@ -54,10 +54,10 @@ public class ClubMyApplyController { } @At - @ApiOperation("删除社团") + @ApiOperation("删除协会") @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.register.myApply") - @SLog(tag = "社团管理系统-社团注册", msg = "删除社团") + @SLog(tag = "协会管理系统-协会注册", msg = "删除协会") public Result doDelete(@Valid String id) { sysClubService.delete(id); sysClubService.dao().clear(SysClubSponsor.class, Cnd.where("clubId", "=", id)); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubRegistApplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubRegistApplyController.java index fa2fb6b..6c11fce 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubRegistApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubRegistApplyController.java @@ -42,7 +42,7 @@ import java.util.List; * @Author: JyuHsin * @Date: 2024/8/6 9:56 * @Version: v1.0.0 - * @Description: 注册社团 + * @Description: 注册协会 **/ @IocBean @Ok("json") @@ -67,7 +67,7 @@ public class ClubRegistApplyController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.register.apply") - @SLog(tag = "社团管理系统-社团注册", msg = "保存注册社团") + @SLog(tag = "协会管理系统-协会注册", msg = "保存注册协会") public Result save(@Param("club") SysClub club, @Param("::deleteIds") List deleteIds, @Param("::managePerson") List managePerson) { @@ -83,7 +83,7 @@ public class ClubRegistApplyController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.register.apply") - @SLog(tag = "社团管理系统-社团注册", msg = "提交注册社团") + @SLog(tag = "协会管理系统-协会注册", msg = "提交注册协会") public Result submit(@Param("club") SysClub club, @Param("::deleteIds") List deleteIds, @Param("::managePerson") List managePerson) { 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 2d5822e..29abd02 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 @@ -232,7 +232,7 @@ public class ClubStatisticsController { nutMap.put("roleName", roleName); nutMap.put("roleCode", list); } - //获取所有社团 + //获取所有协会 Cnd stCnd = Cnd.NEW(); stCnd.andEX("id", "=", clubId); List clubList = sysClubService.query(stCnd); @@ -328,7 +328,7 @@ public class ClubStatisticsController { } List exportEntities = new ArrayList<>(); - exportEntities.add(new ExcelExportEntity("社团名称", "clubName", 20)); + exportEntities.add(new ExcelExportEntity("协会名称", "clubName", 20)); exportEntities.add(new ExcelExportEntity("姓名", "userName", 20)); exportEntities.add(new ExcelExportEntity("工号", "loginName", 20)); exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); @@ -357,9 +357,9 @@ public class ClubStatisticsController { List list = sysClubService.listMap(sql); List exportEntities = new ArrayList<>(); - exportEntities.add(new ExcelExportEntity("社团名称", "clubName", 20)); + exportEntities.add(new ExcelExportEntity("协会名称", "clubName", 20)); exportEntities.add(new ExcelExportEntity("编码", "clubCode", 20)); - exportEntities.add(new ExcelExportEntity("社团总人数", "total", 20)); + exportEntities.add(new ExcelExportEntity("协会总人数", "total", 20)); exportEntities.add(new ExcelExportEntity("在职人数", "work", 20)); exportEntities.add(new ExcelExportEntity("退休人数", "retire", 20)); exportEntities.add(new ExcelExportEntity("男", "man", 20)); @@ -368,7 +368,7 @@ public class ClubStatisticsController { ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list); - CommonDownloadUtil.download("社团统计表.xlsx", workbook, response); + CommonDownloadUtil.download("协会统计表.xlsx", workbook, response); } @At @@ -380,7 +380,7 @@ public class ClubStatisticsController { response.setHeader("Content-Disposition", "attachment;filename=" + URLUtil.encode("上传资料数据.zip")); LinkedHashMap> fileList = new LinkedHashMap<>(); - //查询社团 + //查询协会 List clubList = sysClubService.query(Cnd.NEW().andEX("id", "=", clubId)); clubList.forEach(item -> { List file = new ArrayList<>(); @@ -394,7 +394,7 @@ public class ClubStatisticsController { fileList.put(item.getId(), file); }); - //社团年审附件 + //协会年审附件 List examineList = sysClubService.dao().query(SysClubExamineRegister.class, Cnd.NEW().andEX("clubId", "=", clubId) .and("year(registerDate)", "=", DateUtil.thisYear())); @@ -406,7 +406,7 @@ public class ClubStatisticsController { } }); - //社团评优附件 + //协会评优附件 List evaluateList = sysClubService.dao().query(SysClubEvaluate.class, Cnd.NEW().andEX("clubId", "=", clubId) .and("year(applyTime)", "=", DateUtil.thisYear())); evaluateList.forEach(item -> { @@ -439,7 +439,7 @@ public class ClubStatisticsController { } private Sql generateSql(String clubId, Boolean auditState, String userState, String sex, Boolean giveMoney) { - // 注册流程按社团去重后再关联，避免换届等流程复用社团ID时将会员人数重复统计。 + // 注册流程按协会去重后再关联，避免换届等流程复用协会ID时将会员人数重复统计。 Sql sql = Sqls.create(""" SELECT club.id, diff --git a/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubRefreshUpdateInterceptor.java b/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubRefreshUpdateInterceptor.java index 1bb3c17..271c6cb 100644 --- a/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubRefreshUpdateInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubRefreshUpdateInterceptor.java @@ -25,7 +25,7 @@ public class ClubRefreshUpdateInterceptor implements FlowInterceptor { SysClubRefresh clubRefresh = Json.fromJson(SysClubRefresh.class, formDataStr); Dao dao = ServiceContext.find(Dao.class); - // 审核通过，将新的附件更新到社团表 + // 审核通过，将新的附件更新到协会表 SysClub club = dao.fetch(SysClub.class, clubRefresh.getClubId()); club.setReplaceReport(clubRefresh.getFiles()); dao.update(club); diff --git a/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubRuleUpdateInterceptor.java b/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubRuleUpdateInterceptor.java index 4231594..b7e203d 100644 --- a/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubRuleUpdateInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubRuleUpdateInterceptor.java @@ -24,7 +24,7 @@ public class ClubRuleUpdateInterceptor implements FlowInterceptor { SysClubRule clubRule = Json.fromJson(SysClubRule.class, formDataStr); Dao dao = ServiceContext.find(Dao.class); - // 审核通过，将新的附件更新到社团表 + // 审核通过，将新的附件更新到协会表 SysClub club = dao.fetch(SysClub.class, clubRule.getClubId()); club.setRulesFile(clubRule.getFiles()); dao.update(club); 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 index d9c8fac..bdf5b21 100644 --- a/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserExitInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserExitInterceptor.java @@ -44,7 +44,7 @@ public class ClubUserExitInterceptor implements FlowInterceptor { // 删人 dao.clear(ClubUser.class, Cnd.where(ClubUser::getUserId, "=", clubUserApply.getUserId()).and(ClubUser::getClubId, "=", clubUserApply.getClubId())); - // 2026年10月3日 09:51:00；操作人：wxg：WF 退会完成后，同步将该社团会员的拨付字段置为 false。 + // 2026年10月3日 09:51:00；操作人：wxg：WF 退会完成后，同步将该协会会员的拨付字段置为 false。 ServiceContext.find(ClubPayRecordService.class).disableExitMemberPayment(clubUserApply.getClubId(), clubUserApply.getUserId()); // 删角色 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 7d8d1d8..fdb8c83 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 @@ -47,7 +47,7 @@ public class ClubUserJoinInterceptor implements FlowInterceptor { clubUserApply.setJoinTime(ServiceContext.find(ClubUserJoinService.class).completeJoinApproval( execution.getProcessInstance().getBusinessNo(), execution.getProcessTaskId())); - // 将申请信息复制一份，插入社团成员表 + // 将申请信息复制一份，插入协会成员表 ClubUser clubUser = BeanUtil.copyProperties(clubUserApply, ClubUser.class); // 读取本次已写入的入会申请时间，不能取成立时间或用插入时刻替代审核完成时间。 ClubUserApply approvedApply = dao.fetch(ClubUserApply.class, execution.getProcessInstance().getBusinessNo()); @@ -59,8 +59,8 @@ public class ClubUserJoinInterceptor implements FlowInterceptor { ServiceContext.find(SysClubUserService.class).prepareMemberSnapshots(List.of(clubUser)); dao.insert(clubUser); - // 还要加到社团成员缴费表中 - // 对了，如果同一个人，在同一年，多次加入同一社团，则只插入一条 + // 还要加到协会成员缴费表中 + // 对了，如果同一个人，在同一年，多次加入同一协会，则只插入一条 ClubPayRecord payRecord = dao.fetch( ClubPayRecord.class, Cnd.where(ClubPayRecord::getClubId, "=", clubUser.getClubId()) diff --git a/src/main/java/com/budwk/app/zhgh/club/model/ClubPayRecord.java b/src/main/java/com/budwk/app/zhgh/club/model/ClubPayRecord.java index ce9e83a..33044e2 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/ClubPayRecord.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/ClubPayRecord.java @@ -21,7 +21,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Table("club_pay_record") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团会员缴费记录表") +@Comment("协会会员缴费记录表") public class ClubPayRecord extends BaseModel { @Name @@ -36,7 +36,7 @@ public class ClubPayRecord extends BaseModel { private Integer year; @Column - @Comment("社团ID") + @Comment("协会ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; diff --git a/src/main/java/com/budwk/app/zhgh/club/model/ClubUser.java b/src/main/java/com/budwk/app/zhgh/club/model/ClubUser.java index 19e1a67..8250e8f 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/ClubUser.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/ClubUser.java @@ -14,7 +14,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table("club_user") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团会员表") +@Comment("协会会员表") public class ClubUser extends BaseModel { @Name @@ -24,7 +24,7 @@ public class ClubUser extends BaseModel { private String id; @Column - @Comment("社团ID") + @Comment("协会ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; @@ -39,7 +39,7 @@ public class ClubUser extends BaseModel { private List roleCode = new ArrayList<>(); @Column - @Comment("社团职务") + @Comment("协会职务") @ColDefine(type = ColType.VARCHAR, width = 50) private String clubPosition; @@ -54,7 +54,7 @@ public class ClubUser extends BaseModel { private String avatar; @Column - @Comment("同时参加其他社团情况") + @Comment("同时参加其他协会情况") @ColDefine(type = ColType.VARCHAR, width = 500) private String sameTimeJoinOtherClubSituation; diff --git a/src/main/java/com/budwk/app/zhgh/club/model/ClubUserApply.java b/src/main/java/com/budwk/app/zhgh/club/model/ClubUserApply.java index d4521de..ebc944a 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/ClubUserApply.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/ClubUserApply.java @@ -12,7 +12,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Table("club_user_apply") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团申请退出申请表") +@Comment("协会申请退出申请表") public class ClubUserApply extends BaseModel { @Name @@ -22,7 +22,7 @@ public class ClubUserApply extends BaseModel { private String id; @Column - @Comment("社团ID") + @Comment("协会ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; @@ -42,7 +42,7 @@ public class ClubUserApply extends BaseModel { private Integer mode; @Column - @Comment("社团职务") + @Comment("协会职务") @ColDefine(type = ColType.VARCHAR, width = 50) private String clubPosition; @@ -67,7 +67,7 @@ public class ClubUserApply extends BaseModel { private String avatar; @Column - @Comment("同时参加其他社团情况") + @Comment("同时参加其他协会情况") @ColDefine(type = ColType.VARCHAR, width = 500) private String sameTimeJoinOtherClubSituation; diff --git a/src/main/java/com/budwk/app/zhgh/club/model/SysClub.java b/src/main/java/com/budwk/app/zhgh/club/model/SysClub.java index 2ea042c..6ac5911 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/SysClub.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/SysClub.java @@ -21,7 +21,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table("sys_club") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团") +@Comment("协会") public class SysClub extends BaseModel { @Column @@ -32,26 +32,26 @@ public class SysClub extends BaseModel { private String id; @Column - @Comment("社团名称") + @Comment("协会名称") @ColDefine(type = ColType.VARCHAR, width = 100) - @NotEmpty(message = "社团名称不能为空") + @NotEmpty(message = "协会名称不能为空") private String clubName; @Column - @Comment("社团缩略图") + @Comment("协会缩略图") @ColDefine(type = ColType.VARCHAR, width = 1000) private String thumbnail; @Column - @Comment("社团编码") + @Comment("协会编码") @ColDefine(type = ColType.VARCHAR, width = 100) - @NotEmpty(message = "社团编码不能为空") + @NotEmpty(message = "协会编码不能为空") private String clubCode; @Column - @Comment("社团类型") + @Comment("协会类型") @ColDefine(type = ColType.VARCHAR, width = 30) - @NotEmpty(message = "社团类型不能为空") + @NotEmpty(message = "协会类型不能为空") private String clubType; @Column @@ -70,12 +70,12 @@ public class SysClub extends BaseModel { private String concatPersonEmail; @Column - @Comment("社团介绍") + @Comment("协会介绍") @ColDefine(type = ColType.TEXT) private String introduce; @Column - @Comment("社团宗旨") + @Comment("协会宗旨") @ColDefine(type = ColType.TEXT) private String purpose; diff --git a/src/main/java/com/budwk/app/zhgh/club/model/SysClubEvaluate.java b/src/main/java/com/budwk/app/zhgh/club/model/SysClubEvaluate.java index f804ae5..5e51656 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/SysClubEvaluate.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/SysClubEvaluate.java @@ -21,7 +21,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table("sys_club_evaluate") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团评优") +@Comment("协会评优") public class SysClubEvaluate extends BaseModel { @Column @@ -32,9 +32,9 @@ public class SysClubEvaluate extends BaseModel { private String id; @Column - @Comment("社团id") + @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) - @NotEmpty(message = "社团id不能为空") + @NotEmpty(message = "协会id不能为空") private String clubId; @Column diff --git a/src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegister.java b/src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegister.java index a672c7b..2736a4f 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegister.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegister.java @@ -20,7 +20,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table("sys_club_examine_register") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团年审") +@Comment("协会年审") public class SysClubExamineRegister extends BaseModel { @Column @@ -41,12 +41,12 @@ public class SysClubExamineRegister extends BaseModel { private Integer year; @Column - @Comment("社团id") + @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; @Column - @Comment("社团名称") + @Comment("协会名称") @ColDefine(type = ColType.VARCHAR) private String clubName; @@ -109,7 +109,7 @@ public class SysClubExamineRegister extends BaseModel { private List incomeCensus; @Column - @Comment("社团成员变化情况json") + @Comment("协会成员变化情况json") @ColDefine(type = ColType.MYSQL_JSON) private List changeUserNum; diff --git a/src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegisterDetailed.java b/src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegisterDetailed.java index 9b753ad..d2f44d9 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegisterDetailed.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegisterDetailed.java @@ -11,7 +11,7 @@ import org.nutz.dao.interceptor.annotation.PrevInsert; @EqualsAndHashCode(callSuper = true) @Table("sys_club_examine_register_detailed") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团年审其他信息") +@Comment("协会年审其他信息") public class SysClubExamineRegisterDetailed extends BaseModel { @Column 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 c2f4437..f0df393 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 @@ -19,7 +19,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table("sys_club_manager") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团理事机构") +@Comment("协会理事机构") public class SysClubManager extends BaseModel { @Column @@ -50,7 +50,7 @@ public class SysClubManager extends BaseModel { private String changeUserName; @Column - @Comment("社团id") + @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; 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 979b5a3..1879026 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 @@ -20,7 +20,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table("sys_club_refresh") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团换届报告") +@Comment("协会换届报告") public class SysClubRefresh extends BaseModel { @Column @@ -41,7 +41,7 @@ public class SysClubRefresh extends BaseModel { private String userName; @Column - @Comment("社团id") + @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; diff --git a/src/main/java/com/budwk/app/zhgh/club/model/SysClubRule.java b/src/main/java/com/budwk/app/zhgh/club/model/SysClubRule.java index 1fb760d..d384a8d 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/SysClubRule.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/SysClubRule.java @@ -20,7 +20,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table("sys_club_rule") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团章程修订") +@Comment("协会章程修订") public class SysClubRule extends BaseModel { @Column @@ -41,7 +41,7 @@ public class SysClubRule extends BaseModel { private String userName; @Column - @Comment("社团id") + @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; diff --git a/src/main/java/com/budwk/app/zhgh/club/model/SysClubSponsor.java b/src/main/java/com/budwk/app/zhgh/club/model/SysClubSponsor.java index 13eb445..1869eaa 100644 --- a/src/main/java/com/budwk/app/zhgh/club/model/SysClubSponsor.java +++ b/src/main/java/com/budwk/app/zhgh/club/model/SysClubSponsor.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotEmpty; @EqualsAndHashCode(callSuper = true) @Table("sys_club_sponsor") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团发起人") +@Comment("协会发起人") public class SysClubSponsor extends BaseModel { @Column @@ -29,9 +29,9 @@ public class SysClubSponsor extends BaseModel { private String id; @Column - @Comment("社团id") + @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) - @NotEmpty(message = "社团不能为空") + @NotEmpty(message = "协会不能为空") private String clubId; @Column diff --git a/src/main/java/com/budwk/app/zhgh/club/param/ClubUserPageForm.java b/src/main/java/com/budwk/app/zhgh/club/param/ClubUserPageForm.java index 0223c94..8f6f5c4 100644 --- a/src/main/java/com/budwk/app/zhgh/club/param/ClubUserPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/club/param/ClubUserPageForm.java @@ -34,9 +34,9 @@ public class ClubUserPageForm extends PageForm { private Integer auditType; private Integer source; private Integer year; - /** 社团评优申报开始年度筛选条件。 */ + /** 协会评优申报开始年度筛选条件。 */ private String applyStartYear; - /** 社团评优申报结束年度筛选条件。 */ + /** 协会评优申报结束年度筛选条件。 */ private String applyEndYear; private Boolean giveMoney; private Integer radioType; diff --git a/src/main/java/com/budwk/app/zhgh/club/service/ClubPayRecordService.java b/src/main/java/com/budwk/app/zhgh/club/service/ClubPayRecordService.java index 001ab83..3eb40b9 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/ClubPayRecordService.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/ClubPayRecordService.java @@ -30,14 +30,14 @@ public interface ClubPayRecordService extends BaseService { void prepareSnapshots(List records); /** 2026年10月3日 09:51:00；操作人：wxg：设置缴费状态并保存拨付结果及日志。 - * @param ids 非空缴费记录ID数组；只允许操作当前用户授权社团的记录 + * @param ids 非空缴费记录ID数组；只允许操作当前用户授权协会的记录 * @param payed true已缴费、false未缴费，不能为空 * @return void；参数错误或记录不在授权范围时抛出异常，事务回滚 */ void updatePayStatus(String[] ids, Boolean payed); - /** 2026年10月3日 09:51:00；操作人：wxg：退会后将该用户在指定社团的各年度缴费记录置为不拨付。 - * @param clubId 退会社团ID，不能为空 + /** 2026年10月3日 09:51:00；操作人：wxg：退会后将该用户在指定协会的各年度缴费记录置为不拨付。 + * @param clubId 退会协会ID，不能为空 * @param userId 退会用户ID，不能为空 * @return void；保留缴费状态和人员快照，仅更新 isGiveMoney */ @@ -50,24 +50,24 @@ public interface ClubPayRecordService extends BaseService { */ int generateYearPayRecords(Integer year); - /** 返回当前用户可查询的社团选项，每项包含 id、clubName、clubCode；无授权社团时返回空列表。 */ + /** 返回当前用户可查询的协会选项，每项包含 id、clubName、clubCode；无授权协会时返回空列表。 */ List getPayManageClubList(); /** - * 按权限范围分页查询缴费记录，并按社团编号及缴费记录保存的加入时间排序。 + * 按权限范围分页查询缴费记录，并按协会编号及缴费记录保存的加入时间排序。 * @param pageForm 页码、每页条数及姓名/工号关键字 * @param year 缴费年度，空值表示不限制 - * @param clubId 社团ID，空值表示查询全部授权社团 + * @param clubId 协会ID，空值表示查询全部授权协会 * @param payed 缴费状态：1已缴费、0未缴费、空值不限 * @param assign 保存的拨付状态：1拨付、0不拨付、空值不限 * 2026年10月3日 14:33:18；操作人：wxg：在分页前按实时会员关系筛选，历史年度也使用当前会员状态。 * @param memberState 1在会、0退会、null不限；在会以同一 clubId/userId 存在 club_user 记录为准 - * @return 分页记录，list 包含缴费字段、社团及人员信息、applyTime（保存的入会时间）与 assign（isGiveMoney 保存值转换为布尔值） + * @return 分页记录，list 包含缴费字段、协会及人员信息、applyTime（保存的入会时间）与 assign（isGiveMoney 保存值转换为布尔值） */ Pagination pageData(PageForm pageForm, Integer year, String clubId, Integer payed, Integer assign, Integer memberState); /** - * 获取社团成员是否拨付 + * 获取协会成员是否拨付 * @param userId * @param clubId */ diff --git a/src/main/java/com/budwk/app/zhgh/club/service/ClubRegisterImportService.java b/src/main/java/com/budwk/app/zhgh/club/service/ClubRegisterImportService.java index 159424b..13acbe1 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/ClubRegisterImportService.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/ClubRegisterImportService.java @@ -48,17 +48,17 @@ public class ClubRegisterImportService { String name = values[0]; String code = values[1]; if (StrUtil.isBlank(name)) { - throw new IllegalArgumentException("社团名称不能为空"); + throw new IllegalArgumentException("协会名称不能为空"); } if (dao.count(SysClub.class, Cnd.where("clubName", "=", name)) > 0 || (StrUtil.isNotBlank(code) && dao.count(SysClub.class, Cnd.where("clubCode", "=", code)) > 0)) { - return NutMap.NEW().addv("status", "跳过").addv("message", "社团名称或编码已存在，保留原记录（含草稿、审批中及已解散社团）"); + return NutMap.NEW().addv("status", "跳过").addv("message", "协会名称或编码已存在，保留原记录（含草稿、审批中及已解散协会）"); } if (name.length() > 100 || code.length() > 100) { - throw new IllegalArgumentException("社团名称和编码不能超过100个字符"); + throw new IllegalArgumentException("协会名称和编码不能超过100个字符"); } if (sysDictService.getSubListByCode("CLUB_REGISTER_TYPE").stream().noneMatch(item -> values[2].equals(item.getCode()))) { - throw new IllegalArgumentException("请选择类型对照表中的社团类型编码"); + throw new IllegalArgumentException("请选择类型对照表中的协会类型编码"); } try { LocalDate.parse(values[3]); @@ -82,7 +82,7 @@ public class ClubRegisterImportService { } ProcessDefine define = dao.fetch(ProcessDefine.class, Cnd.where("name", "=", "XHZC").and("state", "=", 1).desc("version")); if (define == null) { - throw new IllegalArgumentException("未配置可用的社团注册定义，无法记录直接通过状态"); + throw new IllegalArgumentException("未配置可用的协会注册定义，无法记录直接通过状态"); } if (StrUtil.isBlank(code)) { int sequence = dao.count(SysClub.class, Cnd.where("year(createTime)", "=", DateUtil.thisYear())) + 1; @@ -116,19 +116,19 @@ public class ClubRegisterImportService { club.setManageFile(files(values[18])); club.setYearPlanFile(files(values[19])); club.setFiles(files(values[20])); - // 复用单个注册：社团、发起人、理事会员资料及入会时间、年度缴费记录和快照。 + // 复用单个注册：协会、发起人、理事会员资料及入会时间、年度缴费记录和快照。 sysClubService.doAdd(club, managers); // 与注册通过后的角色授权一致，但不启动流程或创建审批任务。 for (NutMap manager : managers) { Sys_role role = sysRoleService.getByCode(manager.getString("roleCode")); - if (role == null) throw new IllegalArgumentException("社团角色不存在：" + manager.getString("roleCode")); + if (role == null) throw new IllegalArgumentException("协会角色不存在：" + manager.getString("roleCode")); Sys_user_role relation = new Sys_user_role(); relation.setUserId(manager.getString("userId")); relation.setRoleId(role.getId()); relation.setClubId(club.getId()); dao.insert(relation); } - // 现有社团查询通过已完成实例识别有效社团；保留可追溯的管理员直接通过记录。 + // 现有协会查询通过已完成实例识别有效协会；保留可追溯的管理员直接通过记录。 ProcessInstance instance = new ProcessInstance(); instance.setProcessDefineId(define.getId()); instance.setBusinessNo(club.getId()); @@ -148,7 +148,7 @@ public class ClubRegisterImportService { List names = split(text); if (required && names.size() != 1) throw new IllegalArgumentException("会长、秘书长各需填写1名人员工号"); if (!names.isEmpty() && sysRoleService.getByCode(roleCode) == null) { - throw new IllegalArgumentException("系统未配置社团角色：" + roleCode); + throw new IllegalArgumentException("系统未配置协会角色：" + roleCode); } for (String name : names) { Sys_user user = findUser(name); diff --git a/src/main/java/com/budwk/app/zhgh/club/service/ClubUserJoinService.java b/src/main/java/com/budwk/app/zhgh/club/service/ClubUserJoinService.java index 73e7347..b8f89d1 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/ClubUserJoinService.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/ClubUserJoinService.java @@ -21,27 +21,27 @@ public interface ClubUserJoinService extends BaseService { /** * 构造退会申请数据。 - * 当用户没有历史入会申请记录时，使用当前社团成员关系和人员基础信息兜底生成一份退会申请， - * 以保证会长等通过社团注册直接入会的人员也能正常发起退会流程。 + * 当用户没有历史入会申请记录时，使用当前协会成员关系和人员基础信息兜底生成一份退会申请， + * 以保证会长等通过协会注册直接入会的人员也能正常发起退会流程。 * - * @param clubId 社团ID + * @param clubId 协会ID * @param userId 用户ID * @return 退会申请对象，不存在当前成员关系时返回null */ ClubUserApply buildExitApply(String clubId, String userId); /** - * 获取社团成员的入会时间，优先取当前 club_user.joinTime。 - * 旧会员关系尚无入会时间时，保留历史申请及社团创办时间的原有回退规则。 + * 获取协会成员的入会时间，优先取当前 club_user.joinTime。 + * 旧会员关系尚无入会时间时，保留历史申请及协会创办时间的原有回退规则。 * - * @param clubId 社团ID + * @param clubId 协会ID * @param userId 用户ID * @return 入会时间 */ java.util.Date resolveJoinTime(String clubId, String userId); /** - * 校验当前用户是否满足申请加入社团的资格。 + * 校验当前用户是否满足申请加入协会的资格。 * * @param userId 用户ID * @return 校验不通过时返回提示语，通过时返回null diff --git a/src/main/java/com/budwk/app/zhgh/club/service/SysClubExamineService.java b/src/main/java/com/budwk/app/zhgh/club/service/SysClubExamineService.java index 3bc943a..08b480c 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/SysClubExamineService.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/SysClubExamineService.java @@ -17,7 +17,7 @@ public interface SysClubExamineService extends BaseService /** * 修改时间：2026年10月2日 23:06:55；操作人：wxg。 * 当前会员查询前，用已完成 WF 入会流程的最近一次会长同意审核时间补齐空入会时间。 - * @param pageForm clubId 为选中社团ID；radioType=4 查历史成员且不补齐，其他值查当前会员； + * @param pageForm clubId 为选中协会ID；radioType=4 查历史成员且不补齐，其他值查当前会员； * 姓名/工号、人员类型、在职状态、入会日期范围及分页排序参数用于列表筛选 * @return 会员分页对象，list 中 joinTime 为会员关系保存的入会时间；历史成员仍取申请表时间 */ @@ -38,7 +38,7 @@ public interface SysClubInfoManageService extends BaseService ClubUserJoinVo exitManageInfo(String id); /** - * 管理端直接退会，同时新增系统处理记录并清理当前社团会员关系及角色关联。 + * 管理端直接退会，同时新增系统处理记录并清理当前协会会员关系及角色关联。 * @param membershipId club_user 的会员关系ID，不是用户ID或申请ID * @return void；会员关系不存在或已退会时抛出异常，事务回滚 */ diff --git a/src/main/java/com/budwk/app/zhgh/club/service/SysClubService.java b/src/main/java/com/budwk/app/zhgh/club/service/SysClubService.java index 6cc44c4..8d287c1 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/SysClubService.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/SysClubService.java @@ -24,8 +24,8 @@ import java.util.List; public interface SysClubService extends BaseService { /** - * 获取入会申请的社团下拉选项，供 PC 与 H5 共用。 - * @return 存在已完成 WF 流程的社团列表，每项为 SysClub，包含 id、clubName 等社团字段；同一社团只返回一次 + * 获取入会申请的协会下拉选项，供 PC 与 H5 共用。 + * @return 存在已完成 WF 流程的协会列表，每项为 SysClub，包含 id、clubName 等协会字段；同一协会只返回一次 */ List listJoinClubOptions(); diff --git a/src/main/java/com/budwk/app/zhgh/club/service/SysClubUserService.java b/src/main/java/com/budwk/app/zhgh/club/service/SysClubUserService.java index dadeecf..c35f92e 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/SysClubUserService.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/SysClubUserService.java @@ -19,7 +19,7 @@ public interface SysClubUserService extends BaseService { /** * 为直接新增的会员关系设置本批次的后端确认时间，不覆盖已有入会时间。 - * @param members 手工录入、导入或社团创建时直接新增的会员关系；不得传入审核入会记录 + * @param members 手工录入、导入或协会创建时直接新增的会员关系；不得传入审核入会记录 * @return void；仅填写列表内 joinTime 为空的对象，由调用方在同一事务中保存 */ void prepareDirectJoinTimes(List members); diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubPayRecordServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubPayRecordServiceImpl.java index 0ae6649..eb4e4a9 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubPayRecordServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubPayRecordServiceImpl.java @@ -114,11 +114,11 @@ public class ClubPayRecordServiceImpl extends BaseServiceImpl imp if (records == null || records.isEmpty()) { return; } - // 新增记录须明确所属年度、社团和人员，避免缺失参数形成不受限制的批量查询。 + // 新增记录须明确所属年度、协会和人员，避免缺失参数形成不受限制的批量查询。 for (ClubPayRecord record : records) { if (record == null || record.getYear() == null || record.getYear() < 1 || record.getYear() > 9998 || StrUtil.isBlank(record.getClubId()) || StrUtil.isBlank(record.getUserId())) { - throw new IllegalArgumentException("缴费记录必须提供有效年度、社团和用户"); + throw new IllegalArgumentException("缴费记录必须提供有效年度、协会和用户"); } } List userIds = records.stream().map(ClubPayRecord::getUserId).distinct().toList(); @@ -193,15 +193,15 @@ public class ClubPayRecordServiceImpl extends BaseServiceImpl imp return records.size(); } - /** 校工会社团管理员与系统管理员可查看全部社团缴费记录。 */ + /** 校工会协会管理员与系统管理员可查看全部协会缴费记录。 */ private boolean canManageAllPayClubs() { return AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name()); } - /** 普通菜单授权用户仅能查看其有效角色关联的社团；无关联时显式返回空范围。 */ + /** 普通菜单授权用户仅能查看其有效角色关联的协会；无关联时显式返回空范围。 */ private void addPayClubScope(Cnd cnd, String clubField) { if (!canManageAllPayClubs()) { - // 用户ID使用 SQL 参数绑定，社团集合交给 Cnd 处理，避免空集合被可选条件忽略。 + // 用户ID使用 SQL 参数绑定，协会集合交给 Cnd 处理，避免空集合被可选条件忽略。 Sql scopeSql = Sqls.create(""" SELECT DISTINCT ur.clubId FROM sys_user_role ur INNER JOIN sys_role r ON r.id = ur.roleId AND r.disabled = false @@ -246,7 +246,7 @@ public class ClubPayRecordServiceImpl extends BaseServiceImpl imp addPayClubScope(cnd, "cpr.clubId"); cnd.andEX("cpr.payed", "=", payed); // 在分页前筛选，保证总条数及页数准确；EXISTS 不会因重复会员关系增加缴费记录条数。 - // 与列表 count 标签一致，只看该人员在该社团的当前关系，不依赖退会申请或缴费记录年份。 + // 与列表 count 标签一致，只看该人员在该协会的当前关系，不依赖退会申请或缴费记录年份。 if (memberState != null) { String membershipExists = "EXISTS (SELECT 1 FROM club_user membership " + "WHERE membership.clubId = cpr.clubId AND membership.userId = cpr.userId)"; @@ -263,7 +263,7 @@ public class ClubPayRecordServiceImpl extends BaseServiceImpl imp cnd.and(new Static("(" + ASSIGNED_SQL + ") = " + (assign == 0 ? 0 : 1))); } - // 全社团管理角色先按社团编号分组；普通角色仅在授权社团内按加入时间倒序。 + // 全协会管理角色先按协会编号分组；普通角色仅在授权协会内按加入时间倒序。 if (canManageAllPayClubs()) { cnd.asc("c.clubCode"); cnd.asc("c.id"); @@ -336,7 +336,7 @@ public class ClubPayRecordServiceImpl extends BaseServiceImpl imp public void disableExitMemberPayment(String clubId, String userId) { // 2026年10月3日 09:51:00；操作人：wxg：退会影响实时会员关系对应的各年度名单，保留原缴费状态。 if (StrUtil.isBlank(clubId) || StrUtil.isBlank(userId)) { - throw new IllegalArgumentException("退会社团和用户不能为空"); + throw new IllegalArgumentException("退会协会和用户不能为空"); } Sql sql = Sqls.create("UPDATE club_pay_record SET isGiveMoney = false WHERE clubId = @clubId AND userId = @userId"); sql.setParam("clubId", clubId); diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubUserJoinServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubUserJoinServiceImpl.java index ae33143..595aa95 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubUserJoinServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubUserJoinServiceImpl.java @@ -108,7 +108,7 @@ public class ClubUserJoinServiceImpl extends BaseServiceImpl impl return latestApply; } - // 对于会长等注册社团时直接入会的人员，没有申请记录时从当前成员信息兜底生成退会申请。 + // 对于会长等注册协会时直接入会的人员，没有申请记录时从当前成员信息兜底生成退会申请。 ClubUser clubUser = currentMember; if (clubUser == null) { return null; diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java index 9e77e3c..dc282c5 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java @@ -140,7 +140,7 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl applications = listMap(applySql); // if (!applications.isEmpty()) { -// // 流程状态改为按当前社团申请批量查询，避免相关子查询对流程实例表重复扫描。 +// // 流程状态改为按当前协会申请批量查询，避免相关子查询对流程实例表重复扫描。 // List applicationIds = applications.stream() // .map(application -> application.getString("id")) // .filter(StrUtil::isNotBlank) @@ -313,14 +313,14 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl getClubUserNum(String clubId, Integer year) { if (StrUtil.isBlank(clubId) || year == null || year < 1 || year > 9998) { - throw new IllegalArgumentException("请选择有效社团和统计年度"); + throw new IllegalArgumentException("请选择有效协会和统计年度"); } MemberChangeStatistics stats = new MemberChangeStatistics(year); // 年初基数来自当年名单，不受缴费、拨付或当前退会状态影响；同一会员按 userId 去重。 List roster = listMap(Sqls.create("SELECT userId, joinTime, personType, retireDate, operateLogs FROM club_pay_record WHERE clubId = @clubId AND year = @year") .setParam("clubId", clubId).setParam("year", year)); if (roster.isEmpty()) { - stats.invalidate(year + "年度该社团没有缴费名单，请检查年度名单生成计划任务及名单数据，不能将缺失名单视为年初零人。"); + stats.invalidate(year + "年度该协会没有缴费名单，请检查年度名单生成计划任务及名单数据，不能将缺失名单视为年初零人。"); return stats.result(); } boolean generated = roster.stream().anyMatch(row -> { @@ -328,7 +328,7 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl snapshots = new java.util.LinkedHashMap<>(); Map periods = new java.util.LinkedHashMap<>(); @@ -378,7 +378,7 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl getJgUser(String clubId) { - // 构建社团成员查询SQL，理事机构成员优先展示，普通成员随后展示。 + // 构建协会成员查询SQL，理事机构成员优先展示，普通成员随后展示。 Sql sql = Sqls.create(""" SELECT cl.*, @@ -638,13 +638,13 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl minePageData(ClubUserPageForm pageForm) { Cnd cnd = Cnd.NEW(); - // 非系统管理员，仅查询自己管理的社团（空集合判断避免in查询异常） + // 非系统管理员，仅查询自己管理的协会（空集合判断避免in查询异常） if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { List myManageClub = sysClubService.getMyManageClub(); if (!Lang.isEmpty(myManageClub)) { cnd.and("info.clubId", "in", myManageClub.stream().map(SysClub::getId).collect(Collectors.toList())); } else { - // 无管理社团，返回空分页结果 + // 无管理协会，返回空分页结果 return new Pagination<>(pageForm.getPageNumber(), pageForm.getPageSize(), 0, new ArrayList<>()); } } @@ -719,7 +719,7 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl sortColumns = Map.of( @@ -242,7 +242,7 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl members, String clubId) { if (members.isEmpty()) return; @@ -322,8 +322,8 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl clubList = sysClubService.getMyManageClub().stream() .sorted(Comparator.comparing(SysClub::getClubCode, Comparator.nullsLast(String::compareTo))) .toList(); @@ -608,7 +608,7 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl implements SysC @Override public List listJoinClubOptions() { - // 注册、换届等流程可能使用同一社团ID作为业务号；仅判断流程存在，避免联表将社团重复返回。 + // 注册、换届等流程可能使用同一协会ID作为业务号；仅判断流程存在，避免联表将协会重复返回。 Sql sql = Sqls.create(""" SELECT c.* FROM sys_club c @@ -100,7 +100,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC LEFT JOIN sys_user u on club.concatPerson = u.id $condition """).setParam("userId", SecurityUtil.getUserId()); - // 同一社团可能关联注册、换届等多个已完成 WF 流程；仅检查流程存在，避免列表和分页总数重复。 + // 同一协会可能关联注册、换届等多个已完成 WF 流程；仅检查流程存在，避免列表和分页总数重复。 cnd.and(new Static("EXISTS (SELECT 1 FROM wf_process_instance ins WHERE ins.businessNo = club.id AND ins.state = %s)" .formatted(ProcessInstanceStateEnum.FINISHED.getCode()))); sql.setCondition(cnd); @@ -112,7 +112,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC if (StrUtil.isBlank(clubId)) { return new ClubRegisterVo(); } - // 与社团列表保持一致，按社团成员角色汇总会长、秘书长姓名，避免多名任职人员导致详情记录重复。 + // 与协会列表保持一致，按协会成员角色汇总会长、秘书长姓名，避免多名任职人员导致详情记录重复。 Sql sql = Sqls.create(""" SELECT club.*, @@ -225,12 +225,12 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC log.set("operatorUserId", SecurityUtil.getUserId()); log.set("operatorUserName", SecurityUtil.getUserUsername()); log.set("operatorTime", DateUtil.now()); - log.set("operatorType", "社团创建"); + log.set("operatorType", "协会创建"); log.set("oldValue", null); log.set("newValue", false); record.setOperateLogs(List.of(log)); - // 2026年10月3日 09:05:37；操作人：wxg：社团创建直接入会的成员同样保存缴费快照。 + // 2026年10月3日 09:05:37；操作人：wxg：协会创建直接入会的成员同样保存缴费快照。 payRecordService.prepareSnapshots(List.of(record)); dao().insert(record); } @@ -242,7 +242,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC @Override @Aop(TransAop.READ_COMMITTED) public SysClub doEdit(SysClub club, List deleteIds, List managePerson) { - // 修改社团表 + // 修改协会表 dao().update(club); // 修改发起人表 dao().clear(SysClubSponsor.class, Cnd.where("clubId", "=", club.getId())); @@ -264,7 +264,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC .filter(member -> java.util.Objects.equals(member.getUserId(), clubUser.getUserId())) .findFirst() .ifPresent(member -> { - // 2026年10月3日 12:01:28；操作人：wxg：编辑社团重建既有会员关系时保留原入会时间及人员资料。 + // 2026年10月3日 12:01:28；操作人：wxg：编辑协会重建既有会员关系时保留原入会时间及人员资料。 clubUser.setJoinTime(member.getJoinTime()); clubUser.setUserName(member.getUserName()); clubUser.setLoginName(member.getLoginName()); @@ -323,7 +323,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC } cnd.andEX("year(info.createTime)", "=", pageForm.getYear()); cnd.and("info.userId", "=", SecurityUtil.getUserId()); - // 我的注册列表默认按社团编码升序展示，点击表头时按用户选择的方向排序。 + // 我的注册列表默认按协会编码升序展示，点击表头时按用户选择的方向排序。 if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.asc("info.clubCode"); } else if ("clubCode".equals(pageForm.getPageOrderName())) { diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java index d1e8546..82ecace 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java @@ -229,7 +229,7 @@ public class SysClubUserServiceImpl extends BaseServiceImpl implements @Override public void clubUser2Scope(String clubId, List users) { - // 添加社团成员，需要增加到品牌活动的组别去，wcnm + // 添加协会成员，需要增加到品牌活动的组别去，wcnm List list = dao().query(TrainSignUpActivity.class, Cnd.NEW()); List activityList = new ArrayList<>(); for (TrainSignUpActivity activity : list) { diff --git a/src/main/java/com/budwk/app/zhgh/club/vo/ClubEvaluatePageVo.java b/src/main/java/com/budwk/app/zhgh/club/vo/ClubEvaluatePageVo.java index 4bc4206..00e4941 100644 --- a/src/main/java/com/budwk/app/zhgh/club/vo/ClubEvaluatePageVo.java +++ b/src/main/java/com/budwk/app/zhgh/club/vo/ClubEvaluatePageVo.java @@ -17,9 +17,9 @@ public class ClubEvaluatePageVo { private String foundTime; private String typeName; private Date applyTime; - /** 社团评优申报开始年度。 */ + /** 协会评优申报开始年度。 */ private String applyStartYear; - /** 社团评优申报结束年度。 */ + /** 协会评优申报结束年度。 */ private String applyEndYear; private String instanceId; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleAnalysisController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleAnalysisController.java index 621eb15..f374e93 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleAnalysisController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleAnalysisController.java @@ -101,14 +101,14 @@ public class ArticleAnalysisController { .trend(null) .build()); - // 获取参与社团数量 + // 获取参与协会数量 Sql clubCountSql = Sqls.create("SELECT COUNT(distinct clubId) FROM article $condition"); Cnd clubCountCondition = buildStatisticsCondition(startDate, endDate, unionId, clubId); clubCountCondition.and("clubId", "IS NOT", null); clubCountSql.setCondition(clubCountCondition); long clubCount = articleService.count(clubCountSql); list.add(ArticleAnalysisOverviewVO.builder() - .label("参与社团") + .label("参与协会") .value(clubCount) .icon("el-icon-office-building") .bgColor("rgba(230, 162, 60, 0.1)") @@ -118,7 +118,7 @@ public class ArticleAnalysisController { } /** - * 构建概览统计的筛选条件，与图表接口保持相同的时间范围、分工会和社团口径。 + * 构建概览统计的筛选条件，与图表接口保持相同的时间范围、分工会和协会口径。 */ private Cnd buildStatisticsCondition(Date startDate, Date endDate, String unionId, String clubId) { Cnd cnd = Cnd.NEW(); @@ -148,7 +148,7 @@ public class ArticleAnalysisController { @At @SaCheckPermission("article.analysis") - @ApiOperation(value = "社团投稿分布") + @ApiOperation(value = "协会投稿分布") public Result clubDistribution(Date startDate, Date endDate, String unionId, String clubId) { List clubDistribution = articleAnalysisService.getClubDistribution(startDate, endDate, unionId, clubId); return Result.success(clubDistribution); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleClubApprovalController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleClubApprovalController.java index 26a7213..2539b66 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleClubApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleClubApprovalController.java @@ -41,7 +41,7 @@ import java.util.Map; @IocBean @At("/platform/article/clubApproval") -@Api("新闻投稿社团审核") +@Api("新闻投稿协会审核") @Ok("json:full") public class ArticleClubApprovalController { @Inject diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java index c526000..e1e9b68 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java @@ -140,7 +140,7 @@ public class ArticleFirstExamineController { } else if (result.equals("BACK_TO_CLUB")) { String branchClubApprovalLoginName = commonService.findUserLoginNameByRoleCode(RoleConstant.CLUB_PRESIDENT, Cnd.where(Sys_user_role::getClubId, "=", article.getClubId())); if (StrUtil.isBlank(branchClubApprovalLoginName)) { - return Result.error("社团未配置审批人，请联系社团！"); + return Result.error("协会未配置审批人，请联系协会！"); } assignments.add(branchClubApprovalLoginName); } else if (result.equals("PASS")) { diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java index 9daa058..f9e8ff9 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java @@ -135,7 +135,7 @@ public class ArticleWriteController { roles.add("ARTICLE_ORIGIN_UNION"); } - //查询自己所加入的社团 + //查询自己所加入的协会 List clubUsers = dao.query(ClubUser.class, Cnd.where(ClubUser::getUserId, "=", SecurityUtil.getUserId())); if (!clubUsers.isEmpty()) { roles.add("ARTICLE_ORIGIN_CLUB"); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/models/Article.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/models/Article.java index 1951fef..d99544a 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/models/Article.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/models/Article.java @@ -75,12 +75,12 @@ public class Article extends BaseModel { private String unitName; @Column - @Comment("社团名称") + @Comment("协会名称") @ColDefine(type = ColType.VARCHAR, width = 100) private String clubName; @Column - @Comment("社团id") + @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/param/ArticleInfoPageParam.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/param/ArticleInfoPageParam.java index 960b6c9..d59cd71 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/param/ArticleInfoPageParam.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/param/ArticleInfoPageParam.java @@ -23,7 +23,7 @@ public class ArticleInfoPageParam extends PageForm { @ApiModelProperty("单位") private String unitId; - @ApiModelProperty("社团") + @ApiModelProperty("协会") private String clubId; @ApiModelProperty("稿件来源") diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/ArticleAnalysisService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/ArticleAnalysisService.java index 212c906..03a7ea7 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/ArticleAnalysisService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/ArticleAnalysisService.java @@ -21,7 +21,7 @@ public interface ArticleAnalysisService extends BaseService
{ List getUnionDistribution(Date startDate, Date endDate, String unionId, String clubId); /** - * 获取社团投稿分布 + * 获取协会投稿分布 */ List getClubDistribution(Date startDate, Date endDate, String unionId, String clubId); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/impl/ArticleAnalysisServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/impl/ArticleAnalysisServiceImpl.java index d53687e..9a0431d 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/impl/ArticleAnalysisServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/impl/ArticleAnalysisServiceImpl.java @@ -69,7 +69,7 @@ public class ArticleAnalysisServiceImpl extends BaseServiceImpl
impleme } /** - * 获取社团投稿分布 + * 获取协会投稿分布 */ @Override public List getClubDistribution(Date startDate, Date endDate, String unionId, String clubId) { @@ -96,7 +96,7 @@ public class ArticleAnalysisServiceImpl extends BaseServiceImpl
impleme * @param startDate 查询开始日期，为空时不限制开始时间 * @param endDate 查询结束日期，为空时不限制结束时间 * @param unionId 分工会 ID，为空时查询全部分工会 - * @param clubId 社团 ID，为空时查询全部社团 + * @param clubId 协会 ID，为空时查询全部协会 * @return 可直接设置到统计 SQL 的查询条件 */ private Cnd buildStatisticsCondition(Date startDate, Date endDate, String unionId, String clubId) { diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/vo/ArticleInfoPageVO.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/vo/ArticleInfoPageVO.java index a3ca228..64709de 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/vo/ArticleInfoPageVO.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/vo/ArticleInfoPageVO.java @@ -48,10 +48,10 @@ public class ArticleInfoPageVO extends BpmTaskApprovalVo { @ApiModelProperty("投稿人单位") private String unitName; - @ApiModelProperty("投稿人社团") + @ApiModelProperty("投稿人协会") private String clubName; - @ApiModelProperty("投稿人社团ID") + @ApiModelProperty("投稿人协会ID") private String clubId; @ApiModelProperty("投稿时间") diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/caredata/UnionCareDataCon.java b/src/main/java/com/budwk/app/zhgh/dayofficework/caredata/UnionCareDataCon.java index 06007d1..951378d 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/caredata/UnionCareDataCon.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/caredata/UnionCareDataCon.java @@ -133,7 +133,7 @@ public class UnionCareDataCon { double totalBudgetMoney3 = mapList3.stream().mapToDouble(map -> map.getDouble("totalBudgetMoney")).sum(); list.add(new HashMap() {{ put("year", year); - put("type", "社团经费"); + put("type", "协会经费"); put("value", totalBudgetMoney3); }}); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java index 72aae46..525a458 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java @@ -122,12 +122,12 @@ public class EvaluateApply extends BaseModel { private String unionId; @Column - @Comment("社团") + @Comment("协会") @ColDefine(type = ColType.VARCHAR, width = 100) private String clubName; @Column - @Comment("社团ID") + @Comment("协会ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; @@ -137,7 +137,7 @@ public class EvaluateApply extends BaseModel { private Date applyDateTime; @Column - @Comment("是否社团类型的荣誉") + @Comment("是否协会类型的荣誉") @ColDefine(type = ColType.BOOLEAN) private Boolean isClub; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java index c6cee4c..d7fe10d 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java @@ -152,7 +152,7 @@ public class ActivityBudgetApplyController { @At - @ApiOperation("查询社团，超级管理员查全部的") + @ApiOperation("查询协会，超级管理员查全部的") @SaCheckLogin public Result listClub(){ Cnd cnd = Cnd.NEW(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java index 0753911..78227dd 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java @@ -79,7 +79,7 @@ public class ActivityBudgetQueryStatisticsController { entities.add(new ExcelExportEntity("分工会", "unionName", 20)); }else if (outlayManageSource.equals("ACTIVITY_BUDGET_TYPE_THREE")) { entities.add(new ExcelExportEntity("编码", "clubCode", 20)); - entities.add(new ExcelExportEntity("社团名称", "clubName", 20)); + entities.add(new ExcelExportEntity("协会名称", "clubName", 20)); } ExcelExportEntity draftCodeEntity = new ExcelExportEntity("预算金额", "totalBudgetMoney", 20); draftCodeEntity.setType(10); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudget.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudget.java index ef9e6a0..8f9bc31 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudget.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudget.java @@ -87,7 +87,7 @@ public class ActivityBudget extends BaseModel implements Serializable { private String unionId; @Column - @Comment("创建人所属社团") + @Comment("创建人所属协会") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java index 76f2801..58dd380 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java @@ -180,7 +180,7 @@ public class ActivityBudgetServiceImpl extends BaseServiceImpl i } } else if (activityBudget.getOutlayManageSource().equals("ACTIVITY_BUDGET_TYPE_THREE")) { //如果不等于校工会预算才往表里面加预算 - //代表社团可能用的是校工会的预算 + //代表协会可能用的是校工会的预算 if (!activityBudget.getIsSchoolBudget()) { *//* jf_club jfClub = dao.fetch(jf_club.class, Cnd.where("year", "=", DateUtil.getYear()) .and("club_id", "=", activityBudget.getClubId())); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/template/ActivityBudgetTemp.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/template/ActivityBudgetTemp.java index 5a84e3d..174acb8 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/template/ActivityBudgetTemp.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/template/ActivityBudgetTemp.java @@ -47,7 +47,7 @@ public class ActivityBudgetTemp extends ExcelImportError { @ExcelProperty("审核意见") private String auditOpinion; - @ExcelProperty("申报单位（仅社团申报时可在下拉菜单中选择，其他类型不用填写）") + @ExcelProperty("申报单位（仅协会申报时可在下拉菜单中选择，其他类型不用填写）") private String helpUnitName; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubBackHistoryController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubBackHistoryController.java index a4609cf..74fb04c 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubBackHistoryController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubBackHistoryController.java @@ -38,7 +38,7 @@ import java.util.Objects; @At("/platform/outlay/outlayManage/backHistory") @Ok("json:full") @Slf4j -@Api(tags = "社团经费查询") +@Api(tags = "协会经费查询") public class OutlayManageClubBackHistoryController { @@ -121,7 +121,7 @@ public class OutlayManageClubBackHistoryController { exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); exportEntities.add(new ExcelExportEntity("是否拨付", "isGiveMoney", 20)); exportEntities.add(new ExcelExportEntity("是否缴费", "payed", 20)); - exportEntities.add(new ExcelExportEntity("所在社团", "clubName", 20)); + exportEntities.add(new ExcelExportEntity("所在协会", "clubName", 20)); exportEntities.add(new ExcelExportEntity("身份", "roleName", 20)); try { diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java index 70c32b9..50ccaa4 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; @At("/platform/outlay/outlayManage/clubManage") @Ok("json:full") @Slf4j -@Api(tags = "社团经费预算管理") +@Api(tags = "协会经费预算管理") public class OutlayManageClubController { @Inject @@ -111,20 +111,20 @@ public class OutlayManageClubController { @At @ApiOperation("重置预算") @SaCheckPermission("outlay.outlayManage.club.manage") - @SLog(tag = "社团预算分配", msg = "重置了预算分配的金额:${args[0]}") + @SLog(tag = "协会预算分配", msg = "重置了预算分配的金额:${args[0]}") public Result resetOutlay(Integer year) { int count = baseService.dao().clear(OutlayManageClub.class, Cnd.where("year", "=", year)); return Result.success(count); } /** - * 2026年10月3日 16:23:13；操作人：wxg：年度分配只委托 service，避免 WF 一对多关联造成重复社团预算。 + * 2026年10月3日 16:23:13；操作人：wxg：年度分配只委托 service，避免 WF 一对多关联造成重复协会预算。 * 无业务参数，年度固定为系统当前年；返回 Result.success，新增及重复检查在同一事务完成。 */ @At @ApiOperation("下发预算") @SaCheckPermission("outlay.outlayManage.club.manage") - @SLog(tag = "社团预算分配", msg = "根据申报的金额修改本年的预算预算") + @SLog(tag = "协会预算分配", msg = "根据申报的金额修改本年的预算预算") @Aop(TransAop.READ_COMMITTED) public Result issuedOutlay() { clubQueryService.generateCurrentYearAllocation(); @@ -134,7 +134,7 @@ public class OutlayManageClubController { @At @ApiOperation("给没有核对的人发送核对提醒") @SaCheckPermission("outlay.outlayManage.club.manage") - @SLog(tag = "社团预算分配", msg = "给没有核对的人发送核对提醒") + @SLog(tag = "协会预算分配", msg = "给没有核对的人发送核对提醒") public Result doMsg() { List manageClubList = baseService.dao().query(OutlayManageClub.class, Cnd.where(OutlayManageClub::getYear, "=", DateUtil.thisYear()) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubQueryController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubQueryController.java index c7038f5..e4c5eb6 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubQueryController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubQueryController.java @@ -46,13 +46,13 @@ import java.util.Objects; /** * @author zhf * @date 2026/2/5 09:44 - * @description 社团经费查询 + * @description 协会经费查询 */ @IocBean @At("/platform/outlay/outlayManage/query") @Ok("json:full") @Slf4j -@Api(tags = "社团经费查询") +@Api(tags = "协会经费查询") public class OutlayManageClubQueryController { @Inject @@ -81,7 +81,7 @@ public class OutlayManageClubQueryController { """); cnd.andEX("year", "=", year); // if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - // 现逻辑：系统管理员、校工会社团管理员可查看全部社团分页数据，会长仅查看自己负责的社团。 + // 现逻辑：系统管理员、校工会协会管理员可查看全部协会分页数据，会长仅查看自己负责的协会。 if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name())) { List roleIds = sysRoleService.getRoleIdsByCode(List.of(RoleConstant.CLUB_PRESIDENT, RoleConstant.CLUB_SECRETARY)); List userRoles = clubQueryService.dao().query(Sys_user_role.class, @@ -98,15 +98,15 @@ public class OutlayManageClubQueryController { } /** - * 导出社团拨付核对汇总表。 + * 导出协会拨付核对汇总表。 * * @param year 统计年度，未传时默认当前年度 - * @param clubId 社团主键，可为空；为空时导出当前用户权限范围内的全部社团 + * @param clubId 协会主键，可为空；为空时导出当前用户权限范围内的全部协会 * @param response 下载响应，返回 XSSF Excel 文件流 */ @At @Ok("void") - @ApiOperation("导出社团拨付核对汇总表") + @ApiOperation("导出协会拨付核对汇总表") @SaCheckPermission("outlay.outlayManage.club.query") public void exportSummary(Integer year, String clubId, HttpServletResponse response) { clubQueryService.exportSummary(year, clubId, response); @@ -116,7 +116,7 @@ public class OutlayManageClubQueryController { @At @ApiOperation("提交核对") @SaCheckPermission("outlay.outlayManage.club.query") - @SLog(tag = "社团经费查询", msg = "提交核对") + @SLog(tag = "协会经费查询", msg = "提交核对") public Result doAudit(String id) { clubQueryService.dao().update(OutlayManageClub.class, Chain.make("isCheck", true), @@ -128,7 +128,7 @@ public class OutlayManageClubQueryController { @At @ApiOperation("取消核对") @SaCheckPermission("outlay.outlayManage.club.query") - @SLog(tag = "社团经费查询", msg = "取消核对") + @SLog(tag = "协会经费查询", msg = "取消核对") public Result cancelAudit(String id) { clubQueryService.dao().update(OutlayManageClub.class, Chain.make("isCheck", false), @@ -140,7 +140,7 @@ public class OutlayManageClubQueryController { @At @ApiOperation("更新拨付金额") @SaCheckPermission("outlay.outlayManage.club.query") - @SLog(tag = "社团经费查询", msg = "更新拨付金额") + @SLog(tag = "协会经费查询", msg = "更新拨付金额") public Result doMoney(String clubId) { clubQueryService.doMoney(clubId); @@ -163,7 +163,7 @@ public class OutlayManageClubQueryController { * 查询已拨付未拨付人员列表 * * @param pageForm - * @param clubId 社团id + * @param clubId 协会id * @param type historyUserNum 全部、historyGiveMoneyNum 已拨付、historyNotGiveMoneyNum 未拨付 * @param year * @return @@ -233,7 +233,7 @@ public class OutlayManageClubQueryController { InputStream is = sysOfficeTemplateUtil.getTemplate("jfClubUserBack"); TemplateExportParams exportParams = new TemplateExportParams(is, null); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, map); - CommonDownloadUtil.download(Globals.MyConfig.getString("schoolName") + "教职工社团会员统计表.xlsx", workbook, response); + CommonDownloadUtil.download(Globals.MyConfig.getString("schoolName") + "教职工协会会员统计表.xlsx", workbook, response); } catch (Exception e) { log.error("导出Excel汇总表失败", e); throw new RuntimeException("导出Excel汇总表失败：" + e.getMessage()); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java index b52c15c..d91f1f8 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java @@ -41,7 +41,7 @@ import java.util.List; @At("/platform/outlay/outlayManage/clubUseDetail") @Ok("json:full") @Slf4j -@Api(tags = "社团预算使用明细") +@Api(tags = "协会预算使用明细") public class OutlayManageClubUseDetailController { @Inject @@ -92,15 +92,15 @@ public class OutlayManageClubUseDetailController { } /** - * 导出社团预算使用情况汇总表。 + * 导出协会预算使用情况汇总表。 * * @param year 统计年度，未传时默认当前年度 - * @param clubId 社团主键，可为空；为空时导出当前用户权限范围内的全部社团 + * @param clubId 协会主键，可为空；为空时导出当前用户权限范围内的全部协会 * @param response 下载响应，返回 XSSF Excel 文件流 */ @At @Ok("void") - @ApiOperation("导出社团预算使用情况") + @ApiOperation("导出协会预算使用情况") @SaCheckPermission("outlay.outlayManage.club.useDetail") public void doExport(Integer year, String clubId, HttpServletResponse response) { outlayUseDetailService.exportClubUseDetail(year, clubId, response); @@ -108,7 +108,7 @@ public class OutlayManageClubUseDetailController { @At - @ApiOperation("某个社团预算使用详情") + @ApiOperation("某个协会预算使用详情") @SaCheckPermission("outlay.outlayManage.club.useDetail") public Result detailInfo(PageForm pageForm, String outlayManageId) { Sql sql = Sqls.create(""" @@ -120,10 +120,10 @@ public class OutlayManageClubUseDetailController { @At - @ApiOperation("删除社团预算详情") + @ApiOperation("删除协会预算详情") @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("outlay.outlayManage.club.useDetail") - @SLog(tag = "社团预算使用详情", msg = "删除了社团预算使用详情:${args[0]}") + @SLog(tag = "协会预算使用详情", msg = "删除了协会预算使用详情:${args[0]}") public Result doDeleteDetail(String id) { outlayUseDetailService.doDeleteDetail(id,"club"); return Result.success(); @@ -131,10 +131,10 @@ public class OutlayManageClubUseDetailController { @At - @ApiOperation("编辑社团预算详情") + @ApiOperation("编辑协会预算详情") @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("outlay.outlayManage.club.useDetail") - @SLog(tag = "社团预算使用详情", msg = "编辑了社团预算使用详情:${args[0]}") + @SLog(tag = "协会预算使用详情", msg = "编辑了协会预算使用详情:${args[0]}") public Result doEditDetail(OutlayUseDetail outlayUseDetail) { outlayUseDetailService.doEditDetail(outlayUseDetail,"club"); return Result.success(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayClubUserBackHistory.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayClubUserBackHistory.java index cc75c60..c7b7540 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayClubUserBackHistory.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayClubUserBackHistory.java @@ -31,7 +31,7 @@ public class OutlayClubUserBackHistory extends BaseModel implements Serializable private String id; @Column - @Comment("社团ID") + @Comment("协会ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayManageClub.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayManageClub.java index b2570ef..f6ee719 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayManageClub.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayManageClub.java @@ -17,7 +17,7 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = true) @Table("outlay_manage_club") @TableMeta("{'mysql-charset':'utf8mb4'}") -@Comment("社团经费管理") +@Comment("协会经费管理") public class OutlayManageClub extends BaseModel implements Serializable { @Column @@ -51,7 +51,7 @@ public class OutlayManageClub extends BaseModel implements Serializable { private BigDecimal userAvgMoney; @Column - @Comment("上年度社团人数") + @Comment("上年度协会人数") @Default("0") @ColDefine(type = ColType.INT) private Integer historyUserNum; @@ -69,17 +69,17 @@ public class OutlayManageClub extends BaseModel implements Serializable { private Integer historyNotGiveMoneyNum; @Column - @Comment("社团ID") + @Comment("协会ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; @Column - @Comment("社团名称") + @Comment("协会名称") @ColDefine(type = ColType.VARCHAR) private String clubName; @Column - @Comment("社团code") + @Comment("协会code") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubCode; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageClubQueryService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageClubQueryService.java index 5bbb2cb..0d80847 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageClubQueryService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageClubQueryService.java @@ -10,9 +10,9 @@ import javax.servlet.http.HttpServletResponse; public interface OutlayManageClubQueryService extends BaseService { /** - * 2026年10月3日 16:23:13；操作人：wxg：生成当前年度社团预算，同年度同社团已存在时跳过，不覆盖金额和核对状态。 - * 社团须存在已完成 WF 流程；保留原年度人数统计和拨付金额规则。 - * @return 本次实际新增的预算记录条数，重复调用且没有新增社团时为 0 + * 2026年10月3日 16:23:13；操作人：wxg：生成当前年度协会预算，同年度同协会已存在时跳过，不覆盖金额和核对状态。 + * 协会须存在已完成 WF 流程；保留原年度人数统计和拨付金额规则。 + * @return 本次实际新增的预算记录条数，重复调用且没有新增协会时为 0 */ int generateCurrentYearAllocation(); @@ -21,10 +21,10 @@ public interface OutlayManageClubQueryService extends BaseService { Sql backUserSql(PageForm pageForm, String clubId, String type, Integer year, String payed); /** - * 导出社团拨付核对汇总表。 + * 导出协会拨付核对汇总表。 * * @param year 统计年度，未传时默认当前年度 - * @param clubId 社团主键，可为空；为空时导出当前用户权限范围内的全部社团 + * @param clubId 协会主键，可为空；为空时导出当前用户权限范围内的全部协会 * @param response 下载响应，用于向浏览器输出 XSSF Excel 文件 */ void exportSummary(Integer year, String clubId, HttpServletResponse response); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayUseDetailService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayUseDetailService.java index db895e1..dcefcf4 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayUseDetailService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayUseDetailService.java @@ -17,10 +17,10 @@ public interface OutlayUseDetailService extends BaseService { void doEditDetail(OutlayUseDetail outlayUseDetail,String outlayType); /** - * 导出社团预算使用情况汇总表。 + * 导出协会预算使用情况汇总表。 * * @param year 统计年度 - * @param clubId 社团主键，可为空；为空时导出当前用户权限范围内的全部社团 + * @param clubId 协会主键，可为空；为空时导出当前用户权限范围内的全部协会 * @param response 下载响应，用于向浏览器输出 XSSF Excel 文件 */ void exportClubUseDetail(Integer year, String clubId, HttpServletResponse response); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageClubQueryServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageClubQueryServiceImpl.java index a4f5634..87dd622 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageClubQueryServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageClubQueryServiceImpl.java @@ -60,13 +60,13 @@ public class OutlayManageClubQueryServiceImpl extends BaseServiceImpl implements super(dao); } - /** 2026年10月3日 16:23:13；操作人：wxg：WF 仅用于判断存在；锁定社团并检查已有年度预算，连续或并发分配不重复新增。 */ + /** 2026年10月3日 16:23:13；操作人：wxg：WF 仅用于判断存在；锁定协会并检查已有年度预算，连续或并发分配不重复新增。 */ @Override @Aop(TransAop.READ_COMMITTED) public int generateCurrentYearAllocation() { int year = DateUtil.thisYear(); - // 同一事务先按固定顺序锁定候选社团，串行处理分配请求，随后读取最新年度预算。 - // 不改动 WF 流程，不增加索引；多个已完成流程不会增加候选社团行数。 + // 同一事务先按固定顺序锁定候选协会，串行处理分配请求，随后读取最新年度预算。 + // 不改动 WF 流程，不增加索引；多个已完成流程不会增加候选协会行数。 Sql lockSql = Sqls.create(""" SELECT c.id FROM sys_club c WHERE EXISTS ( @@ -117,7 +117,7 @@ public class OutlayManageClubQueryServiceImpl extends BaseServiceImpl implements List budgets = new ArrayList<>(); for (NutMap club : clubList) { String clubId = club.getString("id"); - // 新增社团若在候选锁定后完成审批，则留到下次处理；既有预算不得重置或覆盖。 + // 新增协会若在候选锁定后完成审批，则留到下次处理；既有预算不得重置或覆盖。 if (!lockedClubs.contains(clubId) || !recordedClubs.add(clubId)) continue; OutlayManageClub budget = new OutlayManageClub(); budget.setYear(year); @@ -285,12 +285,12 @@ public class OutlayManageClubQueryServiceImpl extends BaseServiceImpl implements } /** - * 导出当前用户可查询的社团拨付核对汇总数据。 + * 导出当前用户可查询的协会拨付核对汇总数据。 * 年审人数、可拨付人数和不可拨付人数分别取当前年度记录中的历史统计值； * 拨付标准依据现有规则计算：0 人为 0 元，1 至 49 人为 3000 元，50 人及以上为 5000 元。 * * @param year 统计年度，未传时使用当前年度 - * @param clubId 社团主键，可为空 + * @param clubId 协会主键，可为空 * @param response 下载响应，用于输出 Excel 文件 */ @Override @@ -319,7 +319,7 @@ public class OutlayManageClubQueryServiceImpl extends BaseServiceImpl implements } List exportEntities = new ArrayList<>(); - exportEntities.add(new ExcelExportEntity("社团名称", "clubName", 25)); + exportEntities.add(new ExcelExportEntity("协会名称", "clubName", 25)); exportEntities.add(new ExcelExportEntity("年审人数", "historyUserNum", 15)); exportEntities.add(new ExcelExportEntity("可拨付人数", "historyGiveMoneyNum", 15)); exportEntities.add(new ExcelExportEntity("不可拨付人数", "historyNotGiveMoneyNum", 15)); @@ -330,11 +330,11 @@ public class OutlayManageClubQueryServiceImpl extends BaseServiceImpl implements ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, summaryList); - CommonDownloadUtil.download(queryYear + "年社团拨付核对汇总.xlsx", workbook, response); + CommonDownloadUtil.download(queryYear + "年协会拨付核对汇总.xlsx", workbook, response); } /** - * 根据可拨付人数返回社团年度拨付标准。 + * 根据可拨付人数返回协会年度拨付标准。 * * @param giveMoneyNum 可拨付人数 * @return 对应的拨付标准金额 diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java index da3b19e..4d139fc 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java @@ -61,11 +61,11 @@ public class OutlayUseDetailServiceImpl extends BaseServiceImpl } /** - * 按社团预算使用页面的查询口径导出汇总数据。 + * 按协会预算使用页面的查询口径导出汇总数据。 * 剩余额度由分配总额度减已使用额度计算，避免导出内容与页面展示不一致。 * * @param year 统计年度，未传时使用当前年度 - * @param clubId 社团主键，可为空 + * @param clubId 协会主键，可为空 * @param response 下载响应，用于输出 Excel 文件 */ @Override @@ -96,8 +96,8 @@ public class OutlayUseDetailServiceImpl extends BaseServiceImpl List exportEntities = new ArrayList<>(); exportEntities.add(new ExcelExportEntity("年度", "year", 15)); - exportEntities.add(new ExcelExportEntity("社团名称", "clubName", 25)); - exportEntities.add(new ExcelExportEntity("社团编码", "clubCode", 20)); + exportEntities.add(new ExcelExportEntity("协会名称", "clubName", 25)); + exportEntities.add(new ExcelExportEntity("协会编码", "clubCode", 20)); exportEntities.add(new ExcelExportEntity("分配总额度（元）", "totalQuota", 18)); exportEntities.add(new ExcelExportEntity("已使用额度（元）", "usedQuota", 18)); exportEntities.add(new ExcelExportEntity("剩余额度（元）", "surplusQuota", 18)); @@ -105,7 +105,7 @@ public class OutlayUseDetailServiceImpl extends BaseServiceImpl ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, clubUseDetailList); - CommonDownloadUtil.download(queryYear + "年社团预算使用情况.xlsx", workbook, response); + CommonDownloadUtil.download(queryYear + "年协会预算使用情况.xlsx", workbook, response); } /** diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java index b580087..b852eeb 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java @@ -42,7 +42,7 @@ import java.util.List; @IocBean @Ok("json:full") @Slf4j -@Api(tags = "费用报销管理-社团审核") +@Api(tags = "费用报销管理-协会审核") @At("/platform/outlay/reimburse/clubAudit") public class OutlayReimburseClubAuditController { @@ -136,7 +136,7 @@ public class OutlayReimburseClubAuditController { @At - @ApiOperation("社团审核") + @ApiOperation("协会审核") @SaCheckPermission(value = {"outlay.reimburse.clubAudit", "h5.outlay.reimburse.clubAudit"}, mode = SaMode.OR) public Result submit(@Param("data") OutlayReimburse outlayReimburse) { // 开启流程实例 diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java index c29f6b1..388bb4d 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java @@ -34,7 +34,7 @@ import java.util.List; @IocBean @Ok("json:full") @Slf4j -@Api(tags = "费用报销管理-社团主席审核") +@Api(tags = "费用报销管理-协会主席审核") @At("/platform/outlay/reimburse/clubZxAudit") public class OutlayReimburseClubZxAuditController { diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/model/OutlayReimburse.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/model/OutlayReimburse.java index 04b369f..94fbf57 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/model/OutlayReimburse.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/model/OutlayReimburse.java @@ -70,12 +70,12 @@ public class OutlayReimburse extends BaseModel implements Serializable { private String unionId; @Column - @Comment("社团id") + @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; @Column - @Comment("社团名称") + @Comment("协会名称") @ColDefine(type = ColType.VARCHAR, width = 50) private String clubName; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java index 2c19e84..0b5524f 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java @@ -272,7 +272,7 @@ public class OutlayReimburseApplyServiceImpl extends BaseServiceImpl imple } if (StrUtil.equals(apply.getReserveType(), "club")) { if (siteInfo.getClubWeekReserveLimit() == null || siteInfo.getClubWeekReserveLimit() <= 0) { - return Map.of(false, "请先配置社团每周预约次数"); + return Map.of(false, "请先配置协会每周预约次数"); } String[] range = buildWeekRange(apply.getReserveStartTime()); long count = countEffectiveReserveTimes(apply, "sa.clubId", apply.getClubId(), range[0], range[1]); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java index 560284e..3e91aeb 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java @@ -258,14 +258,14 @@ public class UnionReimburseApplyController { } @At - @ApiOperation("查询社团经费余额") + @ApiOperation("查询协会经费余额") @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR) public Result getClubBudget(@Param("clubId") String clubId) { // 检查clubId参数是否为空 if (StrUtil.isBlank(clubId)) { - return Result.error("社团ID不能为空"); + return Result.error("协会ID不能为空"); } - // 根据社团ID和年份查询特定社团的经费信息 + // 根据协会ID和年份查询特定协会的经费信息 OutlayManageClub outlayManageClub = dao.fetch(OutlayManageClub.class, Cnd.where("clubId", "=", clubId) .and("year", "=", DateUtil.year(new Date()))); @@ -288,9 +288,9 @@ public class UnionReimburseApplyController { } /** - * 查询可申请社团经费报销的社团。 + * 查询可申请协会经费报销的协会。 * - * @return 全部未解散社团列表 + * @return 全部未解散协会列表 */ @At @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java index cb0de5a..79f9698 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java @@ -176,7 +176,7 @@ public class UnionReimburseCollectController { WHEN rei.reimburseProject = 'UNION_REIMBURSE_PROJECT_2' THEN '文体活动' WHEN rei.reimburseProject = 'UNION_REIMBURSE_PROJECT_3' THEN '日常活动' WHEN rei.reimburseProject = 'UNION_REIMBURSE_PROJECT_4' THEN '专项活动' - WHEN rei.reimburseProject = 'UNION_REIMBURSE_PROJECT_5' THEN '社团活动' + WHEN rei.reimburseProject = 'UNION_REIMBURSE_PROJECT_5' THEN '协会活动' ELSE rei.reimburseProject END as reimbursementItemName, u.mobile @@ -261,7 +261,7 @@ public class UnionReimburseCollectController { if (projectDict != null) { item.setReimburseProject(projectDict.getName()); } else if ("UNION_REIMBURSE_PROJECT_5".equals(item.getReimburseProject())) { - item.setReimburseProject("社团活动"); + item.setReimburseProject("协会活动"); } } // 转换报销经费来源 diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java index 7cedc0d..3524bad 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java @@ -19,7 +19,7 @@ import org.nutz.json.Json; import java.math.BigDecimal; import java.util.Date; -//审核同意后扣除校工会、分工会、社团的经费 +//审核同意后扣除校工会、分工会、协会的经费 public class UnionReimburseFundSourceInterceptor implements FlowInterceptor { @@ -80,7 +80,7 @@ public class UnionReimburseFundSourceInterceptor implements FlowInterceptor { dao.insert(detail); } } - //社团 + //协会 else if ("UNION_REIMBURSE_FUND_SOURCE_3".equals(reimburseFundSource)){ OutlayManageClub outlayManageClub = dao.fetch(OutlayManageClub.class, Cnd.where("year", "=", DateUtil.year(new Date()))); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/model/UnionReimburse.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/model/UnionReimburse.java index 79b342c..39ee60a 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/model/UnionReimburse.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/model/UnionReimburse.java @@ -364,7 +364,7 @@ public class UnionReimburse extends BaseModel { private String activityName; @Column - @Comment("活动类型（1.分工会，2.校工会，3.社团）") + @Comment("活动类型（1.分工会，2.校工会，3.协会）") @ColDefine(type = ColType.VARCHAR, width = 32) private String activityType; @@ -390,16 +390,16 @@ public class UnionReimburse extends BaseModel { private Double money; /* - * 所属社团 + * 所属协会 */ @Column - @Comment("社团id") + @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubId; @Column - @Comment("所属社团") + @Comment("所属协会") @ColDefine(type = ColType.VARCHAR, width = 32) private String clubName; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/UnionReimburseService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/UnionReimburseService.java index 2d272ba..05c7c6c 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/UnionReimburseService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/UnionReimburseService.java @@ -58,14 +58,14 @@ public interface UnionReimburseService extends BaseService { Result recognizeInvoice(String fileId, Boolean verifySwitch); /** - * 查询报销可用经费余额，同时校验是否已分配、经费来源权限及社团有效性。 + * 查询报销可用经费余额，同时校验是否已分配、经费来源权限及协会有效性。 */ Result getBudgetBalance(String reimburseFundSource, String clubId, String unionId); /** - * 查询未解散社团，供社团经费报销选择。 + * 查询未解散协会，供协会经费报销选择。 * - * @return 全部未解散社团的ID、名称和编码列表 + * @return 全部未解散协会的ID、名称和编码列表 */ List listReimburseClubs(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseExportServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseExportServiceImpl.java index 46bedab..fdd723f 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseExportServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseExportServiceImpl.java @@ -236,7 +236,7 @@ public class UnionReimburseExportServiceImpl implements UnionReimburseExportServ + ("UNION_REIMBURSE_PROJECT_3".equals(project) ? "√" : "□") + "日常活动 " + ("UNION_REIMBURSE_PROJECT_4".equals(project) ? "√" : "□") + "专项活动"); if ("UNION_REIMBURSE_PROJECT_5".equals(project)) { - data.put("project", "√社团活动"); + data.put("project", "√协会活动"); } data.put("activity", text(form.getActivityName())); data.put("reason", text(form.getPaymentNotes())); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java index 1d49215..2c8b292 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java @@ -175,7 +175,7 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i || "UNION_REIMBURSE_FUND_SOURCE_3".equals(unionReimburse.getReimburseFundSource())) && !Integer.valueOf(1).equals(oldRecord.getStateId()) && !Integer.valueOf(5).equals(oldRecord.getStateId())) { - return Result.error("社团报销仅允许修改草稿或退回的申请"); + return Result.error("协会报销仅允许修改草稿或退回的申请"); } // 人员身份和敏感资料由服务端补齐，避免前端删减字段导致丢失或被篡改。 @@ -512,12 +512,12 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i public Result getBudgetBalance(String reimburseFundSource, String clubId, String unionId) { if ("UNION_REIMBURSE_FUND_SOURCE_3".equals(reimburseFundSource) && listReimburseClubs().stream().noneMatch(club -> Objects.equals(clubId, club.getString("id")))) { - return Result.error("请选择有效的社团"); + return Result.error("请选择有效的协会"); } return queryBudgetBalance(reimburseFundSource, clubId, unionId); } - // 审核人按申请单的经费归属校验预算，不要求审核人同时是该社团负责人。 + // 审核人按申请单的经费归属校验预算，不要求审核人同时是该协会负责人。 private Result queryBudgetBalance(String reimburseFundSource, String clubId, String unionId) { if (StrUtil.isBlank(reimburseFundSource)) { return Result.error("请选择经费来源"); @@ -568,7 +568,7 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i return Result.error("记录不存在"); } if ("UNION_REIMBURSE_FUND_SOURCE_3".equals(dbRecord.getReimburseFundSource())) { - // 同一申请审核串行处理，避免重复点击导致社团已使用额度累计两次。 + // 同一申请审核串行处理，避免重复点击导致协会已使用额度累计两次。 Sql lockSql = Sqls.create("SELECT * FROM union_reimburse WHERE id=@id FOR UPDATE"); lockSql.setParam("id", reimburseId); lockSql.setEntity(dao().getEntity(UnionReimburse.class)); @@ -583,7 +583,7 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i return Result.success(); } if (!Integer.valueOf(2).equals(dbRecord.getStateId())) { - return Result.error("仅可审核待审核确认的社团报销"); + return Result.error("仅可审核待审核确认的协会报销"); } } if (submitType == 3) { @@ -912,7 +912,7 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i if (unionReimburse.getActivityTime() == null) { return Result.error("请选择活动时间"); } - // 文体、日常和社团活动附件选填，其他活动保留附件必填校验。 + // 文体、日常和协会活动附件选填，其他活动保留附件必填校验。 if (!"UNION_REIMBURSE_PROJECT_2".equals(unionReimburse.getReimburseProject()) && !"UNION_REIMBURSE_PROJECT_3".equals(unionReimburse.getReimburseProject()) && !"UNION_REIMBURSE_PROJECT_5".equals(unionReimburse.getReimburseProject()) @@ -1086,7 +1086,7 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i deductSql.setParam("amount", applyMoney); dao().execute(deductSql); if (deductSql.getUpdateCount() != 1) { - return Result.error("社团经费余额不足"); + return Result.error("协会经费余额不足"); } insertUseDetail(unionReimburse, outlayManageClub.getId(), applyMoney); return Result.success(); @@ -1300,7 +1300,7 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i return "专项活动申请"; } if ("UNION_REIMBURSE_PROJECT_5".equals(reimburseProject)) { - return "社团活动申请"; + return "协会活动申请"; } return "报销申请"; } @@ -1310,9 +1310,9 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i } /** - * 查询未解散社团，社团选择和余额查询不按负责人归属过滤。 + * 查询未解散协会，协会选择和余额查询不按负责人归属过滤。 * - * @return 全部未解散社团的ID、名称和编码 + * @return 全部未解散协会的ID、名称和编码 */ @Override public List listReimburseClubs() { @@ -1328,17 +1328,17 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i private Result validateApplicantFundSource(UnionReimburse form) { if ("UNION_REIMBURSE_FUND_SOURCE_3".equals(form.getReimburseFundSource())) { if (!"UNION_REIMBURSE_PROJECT_5".equals(form.getReimburseProject())) { - return Result.error("社团经费请选择社团活动"); + return Result.error("协会经费请选择协会活动"); } NutMap club = listReimburseClubs().stream() .filter(item -> Objects.equals(form.getClubId(), item.getString("id"))) .findFirst().orElse(null); if (club == null) { - return Result.error("请选择有效的社团"); + return Result.error("请选择有效的协会"); } form.setClubName(club.getString("clubName")); } else if ("UNION_REIMBURSE_PROJECT_5".equals(form.getReimburseProject())) { - return Result.error("社团活动只能使用社团经费"); + return Result.error("协会活动只能使用协会经费"); } return null; } diff --git a/src/main/resources/db/club/init_club_member_statistics_menu.sql b/src/main/resources/db/club/init_club_member_statistics_menu.sql index 201a666..c727f17 100644 --- a/src/main/resources/db/club/init_club_member_statistics_menu.sql +++ b/src/main/resources/db/club/init_club_member_statistics_menu.sql @@ -1,4 +1,4 @@ --- 1. 将现有“社团统计”移到新父级下面，保留原权限和角色关联。 +-- 1. 将现有“协会统计”移到新父级下面，保留原权限和角色关联。 UPDATE sys_menu SET parentId = 'f2b61f72eab34e139bc150a2d907c385', path = '001100060001', @@ -7,7 +7,7 @@ SET parentId = 'f2b61f72eab34e139bc150a2d907c385', WHERE id = 'b8817cce3ae34d49844a7ea8d8b15f3f' AND permission = 'club.statistics'; --- 2. 新增“社团统计”父级菜单。 +-- 2. 新增“协会统计”父级菜单。 INSERT INTO sys_menu ( id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, location, hasChildren, @@ -17,7 +17,7 @@ INSERT INTO sys_menu ( 'f2b61f72eab34e139bc150a2d907c385', '', '00110006', - '社团统计', '', 'menu', + '协会统计', '', 'menu', '', '', '', 1, 0, 'club.statistics', 411, 1, '', UNIX_TIMESTAMP(NOW()) * 1000, @@ -43,8 +43,8 @@ INSERT INTO sys_menu ( 'PC', '4cfc8977507c40b3acee8443c7c5a8a3', 'c', 0, 0 ); --- 成员统计可查询所有社团，仅给系统管理员和校工会管理员授权。 --- 社团统计父级 +-- 成员统计可查询所有协会，仅给系统管理员和校工会管理员授权。 +-- 协会统计父级 INSERT INTO sys_role_menu (roleId, menuId) VALUES ('419844ad90f34ca58807e84224905f27', 'f2b61f72eab34e139bc150a2d907c385'), ('6aece46b946e4fb9ac4cb15c0cd8c3e6', 'f2b61f72eab34e139bc150a2d907c385'), diff --git a/src/main/resources/db/init/menus/update_sys_menu_pic_icons_flat_skeuomorphic_blue_minio.sql b/src/main/resources/db/init/menus/update_sys_menu_pic_icons_flat_skeuomorphic_blue_minio.sql index b4d6211..af948d9 100644 --- a/src/main/resources/db/init/menus/update_sys_menu_pic_icons_flat_skeuomorphic_blue_minio.sql +++ b/src/main/resources/db/init/menus/update_sys_menu_pic_icons_flat_skeuomorphic_blue_minio.sql @@ -30,18 +30,18 @@ INSERT INTO `sys_file` (`id`, `engine`, `bucket`, `name`, `suffix`, `sizeKb`, `s ('1fda43541284c86b8d5f406ee5ebf1e0', 'MINIO', 'zjnu', '024_报销申请_6bdef282.png', 'png', '45', '44.8 kB', '1fda43541284c86b8d5f406ee5ebf1e0.png', '/menu-icons/v5-flat-skeuomorphic-blue/1fda43541284c86b8d5f406ee5ebf1e0.png', '/platform/sys/file/download?id=1fda43541284c86b8d5f406ee5ebf1e0', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('f9b7a26ef993a9808b09c67f73d2d296', 'MINIO', 'zjnu', '025_撰写提案_eeaf3366.png', 'png', '41', '40.8 kB', 'f9b7a26ef993a9808b09c67f73d2d296.png', '/menu-icons/v5-flat-skeuomorphic-blue/f9b7a26ef993a9808b09c67f73d2d296.png', '/platform/sys/file/download?id=f9b7a26ef993a9808b09c67f73d2d296', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('b83956a3a3162f17513333e8dfe91f49', 'MINIO', 'zjnu', '026_我的申请_b27178ff.png', 'png', '42', '41.8 kB', 'b83956a3a3162f17513333e8dfe91f49.png', '/menu-icons/v5-flat-skeuomorphic-blue/b83956a3a3162f17513333e8dfe91f49.png', '/platform/sys/file/download?id=b83956a3a3162f17513333e8dfe91f49', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('969f3bc275bbd917b3e3444752d9de38', 'MINIO', 'zjnu', '027_社团审核_87611b6d.png', 'png', '39', '39.5 kB', '969f3bc275bbd917b3e3444752d9de38.png', '/menu-icons/v5-flat-skeuomorphic-blue/969f3bc275bbd917b3e3444752d9de38.png', '/platform/sys/file/download?id=969f3bc275bbd917b3e3444752d9de38', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('d54945a79bce326c126a17ffa7dedd86', 'MINIO', 'zjnu', '028_社团分管主席审核_d0ee5ab9.png', 'png', '39', '38.7 kB', 'd54945a79bce326c126a17ffa7dedd86.png', '/menu-icons/v5-flat-skeuomorphic-blue/d54945a79bce326c126a17ffa7dedd86.png', '/platform/sys/file/download?id=d54945a79bce326c126a17ffa7dedd86', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('969f3bc275bbd917b3e3444752d9de38', 'MINIO', 'zjnu', '027_协会审核_87611b6d.png', 'png', '39', '39.5 kB', '969f3bc275bbd917b3e3444752d9de38.png', '/menu-icons/v5-flat-skeuomorphic-blue/969f3bc275bbd917b3e3444752d9de38.png', '/platform/sys/file/download?id=969f3bc275bbd917b3e3444752d9de38', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('d54945a79bce326c126a17ffa7dedd86', 'MINIO', 'zjnu', '028_协会分管主席审核_d0ee5ab9.png', 'png', '39', '38.7 kB', 'd54945a79bce326c126a17ffa7dedd86.png', '/menu-icons/v5-flat-skeuomorphic-blue/d54945a79bce326c126a17ffa7dedd86.png', '/platform/sys/file/download?id=d54945a79bce326c126a17ffa7dedd86', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('012f4e24cb99feeae830b9e5956f730a', 'MINIO', 'zjnu', '029_分工会审核_af963d19.png', 'png', '40', '39.5 kB', '012f4e24cb99feeae830b9e5956f730a.png', '/menu-icons/v5-flat-skeuomorphic-blue/012f4e24cb99feeae830b9e5956f730a.png', '/platform/sys/file/download?id=012f4e24cb99feeae830b9e5956f730a', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('71f1a5bdd53422a302d50565ed6d8ca7', 'MINIO', 'zjnu', '030_校工会出纳审核_f7a890c7.png', 'png', '40', '39.9 kB', '71f1a5bdd53422a302d50565ed6d8ca7.png', '/menu-icons/v5-flat-skeuomorphic-blue/71f1a5bdd53422a302d50565ed6d8ca7.png', '/platform/sys/file/download?id=71f1a5bdd53422a302d50565ed6d8ca7', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('01ac13ee1b86635f406704686b2826cb', 'MINIO', 'zjnu', '031_校工会会计审核_41410dbe.png', 'png', '40', '40.0 kB', '01ac13ee1b86635f406704686b2826cb.png', '/menu-icons/v5-flat-skeuomorphic-blue/01ac13ee1b86635f406704686b2826cb.png', '/platform/sys/file/download?id=01ac13ee1b86635f406704686b2826cb', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('ff390faffeed11c872ff43c268fc42c8', 'MINIO', 'zjnu', '032_校工会主席终审_5e0c5335.png', 'png', '40', '39.6 kB', 'ff390faffeed11c872ff43c268fc42c8.png', '/menu-icons/v5-flat-skeuomorphic-blue/ff390faffeed11c872ff43c268fc42c8.png', '/platform/sys/file/download?id=ff390faffeed11c872ff43c268fc42c8', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('b077d67b5add801672329f19deedef51', 'MINIO', 'zjnu', '033_社团组织管理_b8bcaa94.png', 'png', '54', '54.2 kB', 'b077d67b5add801672329f19deedef51.png', '/menu-icons/v5-flat-skeuomorphic-blue/b077d67b5add801672329f19deedef51.png', '/platform/sys/file/download?id=b077d67b5add801672329f19deedef51', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('0784cad3fc2147bafafc22cdb00b32b8', 'MINIO', 'zjnu', '034_社团入会_7af124e1.png', 'png', '44', '43.6 kB', '0784cad3fc2147bafafc22cdb00b32b8.png', '/menu-icons/v5-flat-skeuomorphic-blue/0784cad3fc2147bafafc22cdb00b32b8.png', '/platform/sys/file/download?id=0784cad3fc2147bafafc22cdb00b32b8', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('b077d67b5add801672329f19deedef51', 'MINIO', 'zjnu', '033_协会组织管理_b8bcaa94.png', 'png', '54', '54.2 kB', 'b077d67b5add801672329f19deedef51.png', '/menu-icons/v5-flat-skeuomorphic-blue/b077d67b5add801672329f19deedef51.png', '/platform/sys/file/download?id=b077d67b5add801672329f19deedef51', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('0784cad3fc2147bafafc22cdb00b32b8', 'MINIO', 'zjnu', '034_协会入会_7af124e1.png', 'png', '44', '43.6 kB', '0784cad3fc2147bafafc22cdb00b32b8.png', '/menu-icons/v5-flat-skeuomorphic-blue/0784cad3fc2147bafafc22cdb00b32b8.png', '/platform/sys/file/download?id=0784cad3fc2147bafafc22cdb00b32b8', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('ca4ddf8871ab60754812c61781e3820a', 'MINIO', 'zjnu', '035_我的申请_2de433e4.png', 'png', '42', '41.8 kB', 'ca4ddf8871ab60754812c61781e3820a.png', '/menu-icons/v5-flat-skeuomorphic-blue/ca4ddf8871ab60754812c61781e3820a.png', '/platform/sys/file/download?id=ca4ddf8871ab60754812c61781e3820a', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('92251f17382d770a99d6399a9245fed2', 'MINIO', 'zjnu', '036_社团审核_84064805.png', 'png', '39', '39.5 kB', '92251f17382d770a99d6399a9245fed2.png', '/menu-icons/v5-flat-skeuomorphic-blue/92251f17382d770a99d6399a9245fed2.png', '/platform/sys/file/download?id=92251f17382d770a99d6399a9245fed2', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('92251f17382d770a99d6399a9245fed2', 'MINIO', 'zjnu', '036_协会审核_84064805.png', 'png', '39', '39.5 kB', '92251f17382d770a99d6399a9245fed2.png', '/menu-icons/v5-flat-skeuomorphic-blue/92251f17382d770a99d6399a9245fed2.png', '/platform/sys/file/download?id=92251f17382d770a99d6399a9245fed2', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('9b5bf30597169d4b597ec15c64746589', 'MINIO', 'zjnu', '037_校工会审核_dbd21f6b.png', 'png', '40', '39.7 kB', '9b5bf30597169d4b597ec15c64746589.png', '/menu-icons/v5-flat-skeuomorphic-blue/9b5bf30597169d4b597ec15c64746589.png', '/platform/sys/file/download?id=9b5bf30597169d4b597ec15c64746589', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('bff0da0374934156eaf7008420281877', 'MINIO', 'zjnu', '038_我的社团_e585d2ca.png', 'png', '55', '54.9 kB', 'bff0da0374934156eaf7008420281877.png', '/menu-icons/v5-flat-skeuomorphic-blue/bff0da0374934156eaf7008420281877.png', '/platform/sys/file/download?id=bff0da0374934156eaf7008420281877', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('bff0da0374934156eaf7008420281877', 'MINIO', 'zjnu', '038_我的协会_e585d2ca.png', 'png', '55', '54.9 kB', 'bff0da0374934156eaf7008420281877.png', '/menu-icons/v5-flat-skeuomorphic-blue/bff0da0374934156eaf7008420281877.png', '/platform/sys/file/download?id=bff0da0374934156eaf7008420281877', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('9ff5f7ccbf1584cc09c8b0b0b547907b', 'MINIO', 'zjnu', '039_会员管理_7e2b850c.png', 'png', '37', '37.2 kB', '9ff5f7ccbf1584cc09c8b0b0b547907b.png', '/menu-icons/v5-flat-skeuomorphic-blue/9ff5f7ccbf1584cc09c8b0b0b547907b.png', '/platform/sys/file/download?id=9ff5f7ccbf1584cc09c8b0b0b547907b', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('fe79030ce09863147010927ef79d4804', 'MINIO', 'zjnu', '040_会员入会_8f27ac9f.png', 'png', '45', '44.7 kB', 'fe79030ce09863147010927ef79d4804.png', '/menu-icons/v5-flat-skeuomorphic-blue/fe79030ce09863147010927ef79d4804.png', '/platform/sys/file/download?id=fe79030ce09863147010927ef79d4804', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('46ca54df1bb66aaec8d89be47ed888d9', 'MINIO', 'zjnu', '041_我的入会_313842fc.png', 'png', '49', '49.4 kB', '46ca54df1bb66aaec8d89be47ed888d9.png', '/menu-icons/v5-flat-skeuomorphic-blue/46ca54df1bb66aaec8d89be47ed888d9.png', '/platform/sys/file/download?id=46ca54df1bb66aaec8d89be47ed888d9', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), @@ -180,14 +180,14 @@ INSERT INTO `sys_file` (`id`, `engine`, `bucket`, `name`, `suffix`, `sizeKb`, `s ('d5ad8b087c6d12646a2d324370bbb08e', 'MINIO', 'zjnu', '174_新闻投稿_a4cfdc91.png', 'png', '38', '38.4 kB', 'd5ad8b087c6d12646a2d324370bbb08e.png', '/menu-icons/v5-flat-skeuomorphic-blue/d5ad8b087c6d12646a2d324370bbb08e.png', '/platform/sys/file/download?id=d5ad8b087c6d12646a2d324370bbb08e', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('f93ad109e30417aae741ee76d1845798', 'MINIO', 'zjnu', '175_职工建家_fac7e9f5.png', 'png', '40', '39.7 kB', 'f93ad109e30417aae741ee76d1845798.png', '/menu-icons/v5-flat-skeuomorphic-blue/f93ad109e30417aae741ee76d1845798.png', '/platform/sys/file/download?id=f93ad109e30417aae741ee76d1845798', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('3beb1065aefe8d0991c81ee094c8d4a1', 'MINIO', 'zjnu', '176_资产管理_d7c6c17e.png', 'png', '43', '43.5 kB', '3beb1065aefe8d0991c81ee094c8d4a1.png', '/menu-icons/v5-flat-skeuomorphic-blue/3beb1065aefe8d0991c81ee094c8d4a1.png', '/platform/sys/file/download?id=3beb1065aefe8d0991c81ee094c8d4a1', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('ebcddcbc72ce2961b4ba7e67b0bc64d0', 'MINIO', 'zjnu', '177_注册社团_946104dc.png', 'png', '49', '48.9 kB', 'ebcddcbc72ce2961b4ba7e67b0bc64d0.png', '/menu-icons/v5-flat-skeuomorphic-blue/ebcddcbc72ce2961b4ba7e67b0bc64d0.png', '/platform/sys/file/download?id=ebcddcbc72ce2961b4ba7e67b0bc64d0', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('ddd801157bf58265dd9e641482fe972b', 'MINIO', 'zjnu', '178_社团信息维护_f6485820.png', 'png', '37', '36.6 kB', 'ddd801157bf58265dd9e641482fe972b.png', '/menu-icons/v5-flat-skeuomorphic-blue/ddd801157bf58265dd9e641482fe972b.png', '/platform/sys/file/download?id=ddd801157bf58265dd9e641482fe972b', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('7acaa1e469e1ba6450f8563eb4b639fe', 'MINIO', 'zjnu', '179_社团入会_1287eb24.png', 'png', '44', '43.6 kB', '7acaa1e469e1ba6450f8563eb4b639fe.png', '/menu-icons/v5-flat-skeuomorphic-blue/7acaa1e469e1ba6450f8563eb4b639fe.png', '/platform/sys/file/download?id=7acaa1e469e1ba6450f8563eb4b639fe', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('46c041705eaec632dfa73d81b3dcc7b5', 'MINIO', 'zjnu', '180_社团入会_321fa0c8.png', 'png', '44', '43.6 kB', '46c041705eaec632dfa73d81b3dcc7b5.png', '/menu-icons/v5-flat-skeuomorphic-blue/46c041705eaec632dfa73d81b3dcc7b5.png', '/platform/sys/file/download?id=46c041705eaec632dfa73d81b3dcc7b5', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('ebcddcbc72ce2961b4ba7e67b0bc64d0', 'MINIO', 'zjnu', '177_注册协会_946104dc.png', 'png', '49', '48.9 kB', 'ebcddcbc72ce2961b4ba7e67b0bc64d0.png', '/menu-icons/v5-flat-skeuomorphic-blue/ebcddcbc72ce2961b4ba7e67b0bc64d0.png', '/platform/sys/file/download?id=ebcddcbc72ce2961b4ba7e67b0bc64d0', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('ddd801157bf58265dd9e641482fe972b', 'MINIO', 'zjnu', '178_协会信息维护_f6485820.png', 'png', '37', '36.6 kB', 'ddd801157bf58265dd9e641482fe972b.png', '/menu-icons/v5-flat-skeuomorphic-blue/ddd801157bf58265dd9e641482fe972b.png', '/platform/sys/file/download?id=ddd801157bf58265dd9e641482fe972b', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('7acaa1e469e1ba6450f8563eb4b639fe', 'MINIO', 'zjnu', '179_协会入会_1287eb24.png', 'png', '44', '43.6 kB', '7acaa1e469e1ba6450f8563eb4b639fe.png', '/menu-icons/v5-flat-skeuomorphic-blue/7acaa1e469e1ba6450f8563eb4b639fe.png', '/platform/sys/file/download?id=7acaa1e469e1ba6450f8563eb4b639fe', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('46c041705eaec632dfa73d81b3dcc7b5', 'MINIO', 'zjnu', '180_协会入会_321fa0c8.png', 'png', '44', '43.6 kB', '46c041705eaec632dfa73d81b3dcc7b5.png', '/menu-icons/v5-flat-skeuomorphic-blue/46c041705eaec632dfa73d81b3dcc7b5.png', '/platform/sys/file/download?id=46c041705eaec632dfa73d81b3dcc7b5', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('0c1ca1983d4bbf604bce1f308cdf0920', 'MINIO', 'zjnu', '181_年度考核_1ddecada.png', 'png', '45', '45.2 kB', '0c1ca1983d4bbf604bce1f308cdf0920.png', '/menu-icons/v5-flat-skeuomorphic-blue/0c1ca1983d4bbf604bce1f308cdf0920.png', '/platform/sys/file/download?id=0c1ca1983d4bbf604bce1f308cdf0920', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('649ca2608f994767fb3d99e17cd646c3', 'MINIO', 'zjnu', '182_社团评优_3f09f8a9.png', 'png', '49', '49.5 kB', '649ca2608f994767fb3d99e17cd646c3.png', '/menu-icons/v5-flat-skeuomorphic-blue/649ca2608f994767fb3d99e17cd646c3.png', '/platform/sys/file/download?id=649ca2608f994767fb3d99e17cd646c3', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('f9185ffb5188272249a80d0985a8a078', 'MINIO', 'zjnu', '183_社团统计_b8817cce.png', 'png', '38', '37.9 kB', 'f9185ffb5188272249a80d0985a8a078.png', '/menu-icons/v5-flat-skeuomorphic-blue/f9185ffb5188272249a80d0985a8a078.png', '/platform/sys/file/download?id=f9185ffb5188272249a80d0985a8a078', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), -('b03b7789697fa8ceac4f6a3a8b07652d', 'MINIO', 'zjnu', '184_社团文化活动_509423f4.png', 'png', '49', '48.6 kB', 'b03b7789697fa8ceac4f6a3a8b07652d.png', '/menu-icons/v5-flat-skeuomorphic-blue/b03b7789697fa8ceac4f6a3a8b07652d.png', '/platform/sys/file/download?id=b03b7789697fa8ceac4f6a3a8b07652d', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('649ca2608f994767fb3d99e17cd646c3', 'MINIO', 'zjnu', '182_协会评优_3f09f8a9.png', 'png', '49', '49.5 kB', '649ca2608f994767fb3d99e17cd646c3.png', '/menu-icons/v5-flat-skeuomorphic-blue/649ca2608f994767fb3d99e17cd646c3.png', '/platform/sys/file/download?id=649ca2608f994767fb3d99e17cd646c3', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('f9185ffb5188272249a80d0985a8a078', 'MINIO', 'zjnu', '183_协会统计_b8817cce.png', 'png', '38', '37.9 kB', 'f9185ffb5188272249a80d0985a8a078.png', '/menu-icons/v5-flat-skeuomorphic-blue/f9185ffb5188272249a80d0985a8a078.png', '/platform/sys/file/download?id=f9185ffb5188272249a80d0985a8a078', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), +('b03b7789697fa8ceac4f6a3a8b07652d', 'MINIO', 'zjnu', '184_协会文化活动_509423f4.png', 'png', '49', '48.6 kB', 'b03b7789697fa8ceac4f6a3a8b07652d.png', '/menu-icons/v5-flat-skeuomorphic-blue/b03b7789697fa8ceac4f6a3a8b07652d.png', '/platform/sys/file/download?id=b03b7789697fa8ceac4f6a3a8b07652d', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('0335b1721abc858c9ee85cd724173142', 'MINIO', 'zjnu', '185_年度计划总结_e658f630.png', 'png', '53', '52.6 kB', '0335b1721abc858c9ee85cd724173142.png', '/menu-icons/v5-flat-skeuomorphic-blue/0335b1721abc858c9ee85cd724173142.png', '/platform/sys/file/download?id=0335b1721abc858c9ee85cd724173142', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('544e4eb6c6407beb92e0a338c48dfe4c', 'MINIO', 'zjnu', '186_活动申报_895089b9.png', 'png', '37', '36.9 kB', '544e4eb6c6407beb92e0a338c48dfe4c.png', '/menu-icons/v5-flat-skeuomorphic-blue/544e4eb6c6407beb92e0a338c48dfe4c.png', '/platform/sys/file/download?id=544e4eb6c6407beb92e0a338c48dfe4c', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), ('760c3374e24ee833b84f461e48adcc49', 'MINIO', 'zjnu', '187_活动申报_6bb151be.png', 'png', '37', '36.9 kB', '760c3374e24ee833b84f461e48adcc49.png', '/menu-icons/v5-flat-skeuomorphic-blue/760c3374e24ee833b84f461e48adcc49.png', '/platform/sys/file/download?id=760c3374e24ee833b84f461e48adcc49', NULL, NULL, '', 1785994967344, '', 1785994967344, 0), diff --git a/src/main/resources/db/init/menus/update_sys_menu_pic_icons_minio.sql b/src/main/resources/db/init/menus/update_sys_menu_pic_icons_minio.sql index 90da8b0..31fb882 100644 --- a/src/main/resources/db/init/menus/update_sys_menu_pic_icons_minio.sql +++ b/src/main/resources/db/init/menus/update_sys_menu_pic_icons_minio.sql @@ -30,18 +30,18 @@ INSERT INTO `sys_file` (`id`, `engine`, `bucket`, `name`, `suffix`, `sizeKb`, `s ('d030abf3da1bf8c00d93e78586f4a9bc', 'MINIO', 'zjnu', '024_报销申请_6bdef282.png', 'png', '50', '50.0 kB', 'd030abf3da1bf8c00d93e78586f4a9bc.png', '/menu-icons/v4/d030abf3da1bf8c00d93e78586f4a9bc.png', '/platform/sys/file/download?id=d030abf3da1bf8c00d93e78586f4a9bc', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('822abad93728db1326baa27b4f2dbe04', 'MINIO', 'zjnu', '025_撰写提案_eeaf3366.png', 'png', '45', '44.8 kB', '822abad93728db1326baa27b4f2dbe04.png', '/menu-icons/v4/822abad93728db1326baa27b4f2dbe04.png', '/platform/sys/file/download?id=822abad93728db1326baa27b4f2dbe04', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('541f9d25077780099d4e4594bea2bb4e', 'MINIO', 'zjnu', '026_我的申请_b27178ff.png', 'png', '41', '41.1 kB', '541f9d25077780099d4e4594bea2bb4e.png', '/menu-icons/v4/541f9d25077780099d4e4594bea2bb4e.png', '/platform/sys/file/download?id=541f9d25077780099d4e4594bea2bb4e', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('47148702a76cc6ea8e7807ac5d5eb6e1', 'MINIO', 'zjnu', '027_社团审核_87611b6d.png', 'png', '45', '44.7 kB', '47148702a76cc6ea8e7807ac5d5eb6e1.png', '/menu-icons/v4/47148702a76cc6ea8e7807ac5d5eb6e1.png', '/platform/sys/file/download?id=47148702a76cc6ea8e7807ac5d5eb6e1', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('d4e6b7275313903fb7ff9f40046f9ed6', 'MINIO', 'zjnu', '028_社团分管主席审核_d0ee5ab9.png', 'png', '42', '42.2 kB', 'd4e6b7275313903fb7ff9f40046f9ed6.png', '/menu-icons/v4/d4e6b7275313903fb7ff9f40046f9ed6.png', '/platform/sys/file/download?id=d4e6b7275313903fb7ff9f40046f9ed6', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('47148702a76cc6ea8e7807ac5d5eb6e1', 'MINIO', 'zjnu', '027_协会审核_87611b6d.png', 'png', '45', '44.7 kB', '47148702a76cc6ea8e7807ac5d5eb6e1.png', '/menu-icons/v4/47148702a76cc6ea8e7807ac5d5eb6e1.png', '/platform/sys/file/download?id=47148702a76cc6ea8e7807ac5d5eb6e1', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('d4e6b7275313903fb7ff9f40046f9ed6', 'MINIO', 'zjnu', '028_协会分管主席审核_d0ee5ab9.png', 'png', '42', '42.2 kB', 'd4e6b7275313903fb7ff9f40046f9ed6.png', '/menu-icons/v4/d4e6b7275313903fb7ff9f40046f9ed6.png', '/platform/sys/file/download?id=d4e6b7275313903fb7ff9f40046f9ed6', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('153ee7433a7b441bcf0df449a93cf07a', 'MINIO', 'zjnu', '029_分工会审核_af963d19.png', 'png', '44', '44.0 kB', '153ee7433a7b441bcf0df449a93cf07a.png', '/menu-icons/v4/153ee7433a7b441bcf0df449a93cf07a.png', '/platform/sys/file/download?id=153ee7433a7b441bcf0df449a93cf07a', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('88d0311f37bd0d4afb15d3e7e1321dae', 'MINIO', 'zjnu', '030_校工会出纳审核_f7a890c7.png', 'png', '44', '44.4 kB', '88d0311f37bd0d4afb15d3e7e1321dae.png', '/menu-icons/v4/88d0311f37bd0d4afb15d3e7e1321dae.png', '/platform/sys/file/download?id=88d0311f37bd0d4afb15d3e7e1321dae', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('481b4f5262903cbc2a4c4be16144356d', 'MINIO', 'zjnu', '031_校工会会计审核_41410dbe.png', 'png', '45', '44.5 kB', '481b4f5262903cbc2a4c4be16144356d.png', '/menu-icons/v4/481b4f5262903cbc2a4c4be16144356d.png', '/platform/sys/file/download?id=481b4f5262903cbc2a4c4be16144356d', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('43edf5cc953088145c381e89d1a2dbe5', 'MINIO', 'zjnu', '032_校工会主席终审_5e0c5335.png', 'png', '44', '44.1 kB', '43edf5cc953088145c381e89d1a2dbe5.png', '/menu-icons/v4/43edf5cc953088145c381e89d1a2dbe5.png', '/platform/sys/file/download?id=43edf5cc953088145c381e89d1a2dbe5', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('00a707dc661b56698cfa957da4d635e3', 'MINIO', 'zjnu', '033_社团组织管理_b8bcaa94.png', 'png', '44', '44.3 kB', '00a707dc661b56698cfa957da4d635e3.png', '/menu-icons/v4/00a707dc661b56698cfa957da4d635e3.png', '/platform/sys/file/download?id=00a707dc661b56698cfa957da4d635e3', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('d8cf0cffdced461cc4ba8fa4314b35de', 'MINIO', 'zjnu', '034_社团入会_7af124e1.png', 'png', '44', '44.3 kB', 'd8cf0cffdced461cc4ba8fa4314b35de.png', '/menu-icons/v4/d8cf0cffdced461cc4ba8fa4314b35de.png', '/platform/sys/file/download?id=d8cf0cffdced461cc4ba8fa4314b35de', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('00a707dc661b56698cfa957da4d635e3', 'MINIO', 'zjnu', '033_协会组织管理_b8bcaa94.png', 'png', '44', '44.3 kB', '00a707dc661b56698cfa957da4d635e3.png', '/menu-icons/v4/00a707dc661b56698cfa957da4d635e3.png', '/platform/sys/file/download?id=00a707dc661b56698cfa957da4d635e3', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('d8cf0cffdced461cc4ba8fa4314b35de', 'MINIO', 'zjnu', '034_协会入会_7af124e1.png', 'png', '44', '44.3 kB', 'd8cf0cffdced461cc4ba8fa4314b35de.png', '/menu-icons/v4/d8cf0cffdced461cc4ba8fa4314b35de.png', '/platform/sys/file/download?id=d8cf0cffdced461cc4ba8fa4314b35de', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('b269cb65dc856cd4fe21fa05de4fd27e', 'MINIO', 'zjnu', '035_我的申请_2de433e4.png', 'png', '41', '41.1 kB', 'b269cb65dc856cd4fe21fa05de4fd27e.png', '/menu-icons/v4/b269cb65dc856cd4fe21fa05de4fd27e.png', '/platform/sys/file/download?id=b269cb65dc856cd4fe21fa05de4fd27e', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('67dc9fac0d11849f8648dae234270135', 'MINIO', 'zjnu', '036_社团审核_84064805.png', 'png', '45', '44.7 kB', '67dc9fac0d11849f8648dae234270135.png', '/menu-icons/v4/67dc9fac0d11849f8648dae234270135.png', '/platform/sys/file/download?id=67dc9fac0d11849f8648dae234270135', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('67dc9fac0d11849f8648dae234270135', 'MINIO', 'zjnu', '036_协会审核_84064805.png', 'png', '45', '44.7 kB', '67dc9fac0d11849f8648dae234270135.png', '/menu-icons/v4/67dc9fac0d11849f8648dae234270135.png', '/platform/sys/file/download?id=67dc9fac0d11849f8648dae234270135', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('a34ed81f00b2edf70da74dbb8d6b8c99', 'MINIO', 'zjnu', '037_校工会审核_dbd21f6b.png', 'png', '44', '44.2 kB', 'a34ed81f00b2edf70da74dbb8d6b8c99.png', '/menu-icons/v4/a34ed81f00b2edf70da74dbb8d6b8c99.png', '/platform/sys/file/download?id=a34ed81f00b2edf70da74dbb8d6b8c99', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('fcbef87b9f75c924b06fff2a03246b42', 'MINIO', 'zjnu', '038_我的社团_e585d2ca.png', 'png', '44', '43.9 kB', 'fcbef87b9f75c924b06fff2a03246b42.png', '/menu-icons/v4/fcbef87b9f75c924b06fff2a03246b42.png', '/platform/sys/file/download?id=fcbef87b9f75c924b06fff2a03246b42', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('fcbef87b9f75c924b06fff2a03246b42', 'MINIO', 'zjnu', '038_我的协会_e585d2ca.png', 'png', '44', '43.9 kB', 'fcbef87b9f75c924b06fff2a03246b42.png', '/menu-icons/v4/fcbef87b9f75c924b06fff2a03246b42.png', '/platform/sys/file/download?id=fcbef87b9f75c924b06fff2a03246b42', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('ba467095d0ccc678e34979ba679ea020', 'MINIO', 'zjnu', '039_会员管理_7e2b850c.png', 'png', '44', '44.3 kB', 'ba467095d0ccc678e34979ba679ea020.png', '/menu-icons/v4/ba467095d0ccc678e34979ba679ea020.png', '/platform/sys/file/download?id=ba467095d0ccc678e34979ba679ea020', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('b189ac3e64ea6b43a86324a2a57b0595', 'MINIO', 'zjnu', '040_会员入会_8f27ac9f.png', 'png', '44', '44.3 kB', 'b189ac3e64ea6b43a86324a2a57b0595.png', '/menu-icons/v4/b189ac3e64ea6b43a86324a2a57b0595.png', '/platform/sys/file/download?id=b189ac3e64ea6b43a86324a2a57b0595', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('0e14db530463cbcdeb4f23712ce75226', 'MINIO', 'zjnu', '041_我的入会_313842fc.png', 'png', '44', '43.9 kB', '0e14db530463cbcdeb4f23712ce75226.png', '/menu-icons/v4/0e14db530463cbcdeb4f23712ce75226.png', '/platform/sys/file/download?id=0e14db530463cbcdeb4f23712ce75226', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), @@ -180,14 +180,14 @@ INSERT INTO `sys_file` (`id`, `engine`, `bucket`, `name`, `suffix`, `sizeKb`, `s ('837a9b8aad0e1eadceaa693dfa8e19e1', 'MINIO', 'zjnu', '174_新闻投稿_a4cfdc91.png', 'png', '42', '41.9 kB', '837a9b8aad0e1eadceaa693dfa8e19e1.png', '/menu-icons/v4/837a9b8aad0e1eadceaa693dfa8e19e1.png', '/platform/sys/file/download?id=837a9b8aad0e1eadceaa693dfa8e19e1', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('a7d265dfed93cf79fca45e88bd4248ff', 'MINIO', 'zjnu', '175_职工建家_fac7e9f5.png', 'png', '44', '44.3 kB', 'a7d265dfed93cf79fca45e88bd4248ff.png', '/menu-icons/v4/a7d265dfed93cf79fca45e88bd4248ff.png', '/platform/sys/file/download?id=a7d265dfed93cf79fca45e88bd4248ff', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('cc24c0a16a35354f332aff2b2023f0e5', 'MINIO', 'zjnu', '176_资产管理_d7c6c17e.png', 'png', '58', '58.3 kB', 'cc24c0a16a35354f332aff2b2023f0e5.png', '/menu-icons/v4/cc24c0a16a35354f332aff2b2023f0e5.png', '/platform/sys/file/download?id=cc24c0a16a35354f332aff2b2023f0e5', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('648d406bbbf0e32c082f02cf317bc48c', 'MINIO', 'zjnu', '177_注册社团_946104dc.png', 'png', '44', '44.3 kB', '648d406bbbf0e32c082f02cf317bc48c.png', '/menu-icons/v4/648d406bbbf0e32c082f02cf317bc48c.png', '/platform/sys/file/download?id=648d406bbbf0e32c082f02cf317bc48c', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('49c4c2480f2027792674edaf6f40fed4', 'MINIO', 'zjnu', '178_社团信息维护_f6485820.png', 'png', '44', '43.5 kB', '49c4c2480f2027792674edaf6f40fed4.png', '/menu-icons/v4/49c4c2480f2027792674edaf6f40fed4.png', '/platform/sys/file/download?id=49c4c2480f2027792674edaf6f40fed4', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('10903a2e44417f9d20c548e3424dd457', 'MINIO', 'zjnu', '179_社团入会_1287eb24.png', 'png', '44', '44.3 kB', '10903a2e44417f9d20c548e3424dd457.png', '/menu-icons/v4/10903a2e44417f9d20c548e3424dd457.png', '/platform/sys/file/download?id=10903a2e44417f9d20c548e3424dd457', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('486385e3da464ace8cf812de8a460761', 'MINIO', 'zjnu', '180_社团入会_321fa0c8.png', 'png', '44', '44.3 kB', '486385e3da464ace8cf812de8a460761.png', '/menu-icons/v4/486385e3da464ace8cf812de8a460761.png', '/platform/sys/file/download?id=486385e3da464ace8cf812de8a460761', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('648d406bbbf0e32c082f02cf317bc48c', 'MINIO', 'zjnu', '177_注册协会_946104dc.png', 'png', '44', '44.3 kB', '648d406bbbf0e32c082f02cf317bc48c.png', '/menu-icons/v4/648d406bbbf0e32c082f02cf317bc48c.png', '/platform/sys/file/download?id=648d406bbbf0e32c082f02cf317bc48c', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('49c4c2480f2027792674edaf6f40fed4', 'MINIO', 'zjnu', '178_协会信息维护_f6485820.png', 'png', '44', '43.5 kB', '49c4c2480f2027792674edaf6f40fed4.png', '/menu-icons/v4/49c4c2480f2027792674edaf6f40fed4.png', '/platform/sys/file/download?id=49c4c2480f2027792674edaf6f40fed4', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('10903a2e44417f9d20c548e3424dd457', 'MINIO', 'zjnu', '179_协会入会_1287eb24.png', 'png', '44', '44.3 kB', '10903a2e44417f9d20c548e3424dd457.png', '/menu-icons/v4/10903a2e44417f9d20c548e3424dd457.png', '/platform/sys/file/download?id=10903a2e44417f9d20c548e3424dd457', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('486385e3da464ace8cf812de8a460761', 'MINIO', 'zjnu', '180_协会入会_321fa0c8.png', 'png', '44', '44.3 kB', '486385e3da464ace8cf812de8a460761.png', '/menu-icons/v4/486385e3da464ace8cf812de8a460761.png', '/platform/sys/file/download?id=486385e3da464ace8cf812de8a460761', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('88e8b7b022ed0c2929615bfedd231e45', 'MINIO', 'zjnu', '181_年度考核_1ddecada.png', 'png', '46', '45.7 kB', '88e8b7b022ed0c2929615bfedd231e45.png', '/menu-icons/v4/88e8b7b022ed0c2929615bfedd231e45.png', '/platform/sys/file/download?id=88e8b7b022ed0c2929615bfedd231e45', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('1a174db6bdd59b2d7e98dadf52f7f854', 'MINIO', 'zjnu', '182_社团评优_3f09f8a9.png', 'png', '51', '51.0 kB', '1a174db6bdd59b2d7e98dadf52f7f854.png', '/menu-icons/v4/1a174db6bdd59b2d7e98dadf52f7f854.png', '/platform/sys/file/download?id=1a174db6bdd59b2d7e98dadf52f7f854', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('d7cb87646b1579a51daff50de1c4747c', 'MINIO', 'zjnu', '183_社团统计_b8817cce.png', 'png', '44', '43.7 kB', 'd7cb87646b1579a51daff50de1c4747c.png', '/menu-icons/v4/d7cb87646b1579a51daff50de1c4747c.png', '/platform/sys/file/download?id=d7cb87646b1579a51daff50de1c4747c', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), -('5edf99eb06031a98bc0f23b03f89bde1', 'MINIO', 'zjnu', '184_社团文化活动_509423f4.png', 'png', '42', '42.0 kB', '5edf99eb06031a98bc0f23b03f89bde1.png', '/menu-icons/v4/5edf99eb06031a98bc0f23b03f89bde1.png', '/platform/sys/file/download?id=5edf99eb06031a98bc0f23b03f89bde1', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('1a174db6bdd59b2d7e98dadf52f7f854', 'MINIO', 'zjnu', '182_协会评优_3f09f8a9.png', 'png', '51', '51.0 kB', '1a174db6bdd59b2d7e98dadf52f7f854.png', '/menu-icons/v4/1a174db6bdd59b2d7e98dadf52f7f854.png', '/platform/sys/file/download?id=1a174db6bdd59b2d7e98dadf52f7f854', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('d7cb87646b1579a51daff50de1c4747c', 'MINIO', 'zjnu', '183_协会统计_b8817cce.png', 'png', '44', '43.7 kB', 'd7cb87646b1579a51daff50de1c4747c.png', '/menu-icons/v4/d7cb87646b1579a51daff50de1c4747c.png', '/platform/sys/file/download?id=d7cb87646b1579a51daff50de1c4747c', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), +('5edf99eb06031a98bc0f23b03f89bde1', 'MINIO', 'zjnu', '184_协会文化活动_509423f4.png', 'png', '42', '42.0 kB', '5edf99eb06031a98bc0f23b03f89bde1.png', '/menu-icons/v4/5edf99eb06031a98bc0f23b03f89bde1.png', '/platform/sys/file/download?id=5edf99eb06031a98bc0f23b03f89bde1', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('2b9fa4f9ab358355cbaf7aa9835556ef', 'MINIO', 'zjnu', '185_年度计划总结_e658f630.png', 'png', '42', '41.9 kB', '2b9fa4f9ab358355cbaf7aa9835556ef.png', '/menu-icons/v4/2b9fa4f9ab358355cbaf7aa9835556ef.png', '/platform/sys/file/download?id=2b9fa4f9ab358355cbaf7aa9835556ef', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('c88694f42e0203e48d3e49f6e5e066a8', 'MINIO', 'zjnu', '186_活动申报_895089b9.png', 'png', '41', '41.3 kB', 'c88694f42e0203e48d3e49f6e5e066a8.png', '/menu-icons/v4/c88694f42e0203e48d3e49f6e5e066a8.png', '/platform/sys/file/download?id=c88694f42e0203e48d3e49f6e5e066a8', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), ('7fec918647b9b82d4b37e2ded5cc3273', 'MINIO', 'zjnu', '187_活动申报_6bb151be.png', 'png', '41', '41.3 kB', '7fec918647b9b82d4b37e2ded5cc3273.png', '/menu-icons/v4/7fec918647b9b82d4b37e2ded5cc3273.png', '/platform/sys/file/download?id=7fec918647b9b82d4b37e2ded5cc3273', NULL, NULL, '', 1785921322195, '', 1785921322195, 0), diff --git a/src/main/resources/db/init/zhgh_zjnu.sql b/src/main/resources/db/init/zhgh_zjnu.sql index fd00dd1..e2e4cc7 100644 --- a/src/main/resources/db/init/zhgh_zjnu.sql +++ b/src/main/resources/db/init/zhgh_zjnu.sql @@ -1217,7 +1217,7 @@ CREATE TABLE `activity_budget` ( `declareTotalBudgetMoney` decimal(10, 2) NULL DEFAULT NULL COMMENT '申报金额', `outlayManageSource` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '预算类型', `unionId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人工会', - `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人所属社团', + `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人所属协会', `helpUnitName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '举办单位', `applyDate` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '申报时间', `schoolAuditId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '校工会审核', @@ -1436,11 +1436,11 @@ CREATE TABLE `activity_school` ( `precautions` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '注意事项（竞赛）', `eventNotification` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '活动通知（非竞赛）', `close` tinyint(1) NULL DEFAULT NULL COMMENT '是否关闭', - `activityLevel` bigint NULL DEFAULT NULL COMMENT '活动级别（40001-校级、40002-分工会、40003-社团或协会）', + `activityLevel` bigint NULL DEFAULT NULL COMMENT '活动级别（40001-校级、40002-分工会、40003-协会或协会）', `isSave` tinyint(1) NULL DEFAULT NULL COMMENT '是否保存', `image` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '小程序活动封面', `belongUnionId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '活动所属工会', - `belongClubId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '活动所属社团', + `belongClubId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '活动所属协会', `foundDate` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建时间', `xlFlag` tinyint(1) NULL DEFAULT NULL COMMENT '是否发送系统消息', `createdBy` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人', @@ -1598,7 +1598,7 @@ CREATE TABLE `activity_tissue` ( `otherFiles` json NULL COMMENT '其他', `type` bigint NULL DEFAULT NULL COMMENT '活动类型', `unionId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人所属工会', - `clubId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人所属社团', + `clubId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人所属协会', `activityContent` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '活动内容', `activityExamineContent` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '活动考核内容', `signUpMethod` int NULL DEFAULT NULL COMMENT '报名方式(1.个人 2.分工会 null.不需要报名)', @@ -1639,7 +1639,7 @@ CREATE TABLE `activity_tissue` ( DROP TABLE IF EXISTS `activity_tissue_person`; CREATE TABLE `activity_tissue_person` ( `id` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT 'ID', - `tissueId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或社团活动ID', + `tissueId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或协会活动ID', `userId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '用户ID', `applyUserId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '报名人ID', `applyUserUserName` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '报名人姓名', @@ -4294,10 +4294,10 @@ CREATE TABLE `evaluate_apply` ( `unitId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单位ID', `unionName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '分工会', `unionId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '分工会ID', - `clubName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团', - `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团ID', + `clubName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会', + `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会ID', `applyDateTime` datetime NULL DEFAULT NULL COMMENT '申请时间', - `isClub` tinyint(1) NULL DEFAULT NULL COMMENT '是否社团类型的荣誉', + `isClub` tinyint(1) NULL DEFAULT NULL COMMENT '是否协会类型的荣誉', `createdBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', `createdAt` bigint NULL DEFAULT NULL COMMENT '创建时间', `updatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人', @@ -8410,7 +8410,7 @@ CREATE TABLE `outlay_manage_club` ( `updatedAt` bigint NULL DEFAULT NULL COMMENT '修改时间', `delFlag` tinyint(1) NULL DEFAULT NULL COMMENT '删除标记', `userAvgMoney` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '人均额度', - `historyUserNum` int NULL DEFAULT 0 COMMENT '上年度社团人数', + `historyUserNum` int NULL DEFAULT 0 COMMENT '上年度协会人数', `historyGiveMoneyNum` int NULL DEFAULT 0 COMMENT '上年度拨付人数', `historyNotGiveMoneyNum` int NULL DEFAULT 0 COMMENT '上年度未拨付人数', `isCheck` tinyint(1) NULL DEFAULT 0 COMMENT '是否核对', @@ -8469,8 +8469,8 @@ CREATE TABLE `outlay_reimburse` ( `unitId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单位id', `unionName` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '工会', `unionId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '工会id', - `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id', - `clubName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团名称', + `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id', + `clubName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会名称', `outlayManageSource` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报销经费来源', `activityTime` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动时间', `activityNumber` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动人数', @@ -10269,7 +10269,7 @@ CREATE TABLE `site_cug_info` ( `termStartDate` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '本学期开始时间', `termEndDate` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '本学期结束时间', `unionYearReserveLimit` int NULL DEFAULT 2 COMMENT '分工会每年预约次数', - `clubWeekReserveLimit` int NULL DEFAULT 2 COMMENT '社团每周预约次数', + `clubWeekReserveLimit` int NULL DEFAULT 2 COMMENT '协会每周预约次数', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '场地信息-场馆' ROW_FORMAT = DYNAMIC; @@ -10679,7 +10679,7 @@ CREATE TABLE `sys_club` ( DROP TABLE IF EXISTS `sys_club_evaluate`; CREATE TABLE `sys_club_evaluate` ( `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id', - `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id', + `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id', `userId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '申报人id', `applyTime` datetime NULL DEFAULT NULL COMMENT '申报时间', `applyStartYear` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '申报开始年份', @@ -10706,8 +10706,8 @@ DROP TABLE IF EXISTS `sys_club_examine_register`; CREATE TABLE `sys_club_examine_register` ( `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id', `year` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '年度', - `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id', - `clubName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团名称', + `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id', + `clubName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会名称', `foundTime` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '成立时间', `due` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '会费标准', `activityQk` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '年度活动情况', @@ -10718,9 +10718,9 @@ CREATE TABLE `sys_club_examine_register` ( `yearActivity` json NULL COMMENT '年度活动情况', `yearActivitys` json NULL COMMENT '年度活动情况', `incomeCensus` json NULL COMMENT '财务收支情况统计json', - `changeUserNum` json NULL COMMENT '社团成员变化情况json', + `changeUserNum` json NULL COMMENT '协会成员变化情况json', `auditId` int NULL DEFAULT NULL COMMENT '审核状态', - `clubAuditId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团负责人审核意见id', + `clubAuditId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会负责人审核意见id', `clubLeaderAuditId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '会长审核意见id', `schoolAuditId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '校工会审核意见id', `createdBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', @@ -10766,7 +10766,7 @@ CREATE TABLE `sys_club_files` ( `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id', `userId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户', `userName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户姓名', - `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id', + `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id', `bTime` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备份时间', `fileType` int NULL DEFAULT NULL COMMENT '文件类型，1是换届报告，2是章程', `files` json NULL COMMENT '文件', @@ -10786,7 +10786,7 @@ CREATE TABLE `sys_club_manager` ( `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id', `userId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户', `userName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户姓名', - `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id', + `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id', `creatTime` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '提交时间', `oldRoleCode` json NULL COMMENT '旧身份', `nowRoleCode` json NULL COMMENT '变更的身份', @@ -10809,7 +10809,7 @@ CREATE TABLE `sys_club_refresh` ( `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id', `userId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户', `userName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户姓名', - `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id', + `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id', `creatTime` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '提交时间', `lastFiles` json NULL COMMENT '上一次的文件', `files` json NULL COMMENT '文件', @@ -10830,7 +10830,7 @@ CREATE TABLE `sys_club_rule` ( `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id', `userId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户', `userName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户姓名', - `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id', + `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id', `creatTime` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '提交时间', `files` json NULL COMMENT '文件', `createdBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', @@ -13640,19 +13640,19 @@ CREATE TABLE `union_reimburse` ( `money` decimal(10, 2) NULL DEFAULT NULL COMMENT '慰问金额/报销金额', `condolenceTime` datetime NULL DEFAULT NULL COMMENT '慰问时间', `activityName` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动名称', - `activityType` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动类型（1.分工会，2.校工会，3.社团）', + `activityType` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动类型（1.分工会，2.校工会，3.协会）', `activityNumber` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动人数', `activityTime` datetime NULL DEFAULT NULL COMMENT '活动时间', `venue` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动地点', - `club` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属社团', + `club` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属协会', `createdBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', `createdAt` bigint NULL DEFAULT NULL COMMENT '创建时间', `updatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人', `updatedAt` bigint NULL DEFAULT NULL COMMENT '修改时间', `delFlag` tinyint(1) NULL DEFAULT NULL COMMENT '删除标记', `activityPlace` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动地点', - `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id', - `clubName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属社团', + `clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id', + `clubName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属协会', `createTime` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '申请时间', `unitId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '经办人单位ID', `unitName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '经办人单位名称', @@ -14825,15 +14825,15 @@ CREATE TABLE `year_plan` ( `planTime` varchar(200) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '计划时间', `content` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '计划内容', `money` decimal(15, 10) NULL DEFAULT NULL COMMENT '预算费用', - `planType` varchar(7) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '计划类型(1-校活动、2-分工会活动、3协会社团活动)', - `tissueId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会ID或社团ID', + `planType` varchar(7) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '计划类型(1-校活动、2-分工会活动、3协会协会活动)', + `tissueId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会ID或协会ID', `activityType` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '活动类型', `createdBy` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人', `createdAt` bigint NULL DEFAULT NULL COMMENT '创建时间', `updatedBy` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '修改人', `updatedAt` bigint NULL DEFAULT NULL COMMENT '修改时间', `delFlag` tinyint(1) NULL DEFAULT NULL COMMENT '删除标记', - `tissueName` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或社团', + `tissueName` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或协会', `contributionId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '项目Id', `contributionName` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '项目', `userId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '支付人Id', @@ -14861,7 +14861,7 @@ CREATE TABLE `year_summary` ( `cTime` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '提交时间', `tissueId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '工会/协会id', `summaryType` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '总结类型', - `summaryFrom` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '总结来源（1-校活动、2-分工会活动、3协会社团活动）', + `summaryFrom` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '总结来源（1-校活动、2-分工会活动、3协会协会活动）', `files` json NULL COMMENT '文件', `createdBy` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人', `createdAt` bigint NULL DEFAULT NULL COMMENT '创建时间', @@ -14874,7 +14874,7 @@ CREATE TABLE `year_summary` ( `unitName` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '提交人单位', `unionId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '提交人工会ID', `unionName` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '提交人单位', - `tissueName` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或社团', + `tissueName` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或协会', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '年度总结' ROW_FORMAT = DYNAMIC; diff --git a/src/main/resources/db/sys_club_add_thumbnail.sql b/src/main/resources/db/sys_club_add_thumbnail.sql index a62f9ed..54775cc 100644 --- a/src/main/resources/db/sys_club_add_thumbnail.sql +++ b/src/main/resources/db/sys_club_add_thumbnail.sql @@ -1,4 +1,4 @@ --- 社团缩略图保存系统文件下载地址；保留可空以兼容未上传图片的历史社团。 +-- 协会缩略图保存系统文件下载地址；保留可空以兼容未上传图片的历史协会。 -- 字段存在时跳过，避免重复执行迁移时报错。 SET @club_thumbnail_column_count = ( SELECT COUNT(*) @@ -10,7 +10,7 @@ SET @club_thumbnail_column_count = ( SET @club_thumbnail_ddl = IF( @club_thumbnail_column_count = 0, - 'ALTER TABLE sys_club ADD COLUMN thumbnail VARCHAR(1000) NULL COMMENT ''社团缩略图'' AFTER clubName', + 'ALTER TABLE sys_club ADD COLUMN thumbnail VARCHAR(1000) NULL COMMENT ''协会缩略图'' AFTER clubName', 'SELECT 1' ); diff --git a/src/main/resources/db/union_reimburse_add_club_activity_dict.sql b/src/main/resources/db/union_reimburse_add_club_activity_dict.sql index f488944..07dad8b 100644 --- a/src/main/resources/db/union_reimburse_add_club_activity_dict.sql +++ b/src/main/resources/db/union_reimburse_add_club_activity_dict.sql @@ -1,4 +1,4 @@ --- 社团活动属于报销项目的正式字典配置，两端沿用现有字典接口读取。 +-- 协会活动属于报销项目的正式字典配置，两端沿用现有字典接口读取。 -- 仅补充缺失记录；已有记录（包括已禁用记录）不覆盖，不在查询接口中添加兜底项。 INSERT INTO sys_dict ( id, parentId, path, name, remark, code, disabled, location, hasChildren, @@ -12,7 +12,7 @@ SELECT FROM sys_dict child WHERE child.path LIKE CONCAT(parent.path, '____') ), 0) + 1, 4, '0')), - '社团活动', + '协会活动', '', 'UNION_REIMBURSE_PROJECT_5', 0, diff --git a/src/main/resources/static/components/module/activity/UserScope.vue b/src/main/resources/static/components/module/activity/UserScope.vue index 295aa5a..a0407ac 100644 --- a/src/main/resources/static/components/module/activity/UserScope.vue +++ b/src/main/resources/static/components/module/activity/UserScope.vue @@ -217,13 +217,13 @@ - 社团： + 协会： - + {{ viewData.address }} diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js b/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js index 32855eb..df8f274 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js @@ -200,7 +200,7 @@ const ACTIVITY_CULTURE_INFO_MANAGE = { } }, computed: { - // 当前双页签及满高列表仅用于校工会、分工会文化活动，社团页面保持原样。 + // 当前双页签及满高列表仅用于校工会、分工会文化活动，协会页面保持原样。 isTemplateManagedActivity() { return this.activity_type === 40001 || this.activity_type === 40002 }, diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js b/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js index 57e4427..3e4dbc4 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js @@ -23,7 +23,7 @@ const singleSignUp = { {{ viewData.activity_type === 40001 ? '校工会活动' : viewData.activity_type === 40002 ? '分工会活动' : - '社团/社团活动' }} + '协会/协会活动' }} {{ viewData.address }} diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html index 64bc092..e1be85a 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html @@ -28,9 +28,9 @@