协会

2024-12-19 08:51:46 +08:00
parent 3b4c3e1552
commit 3e4ed35a7c
96 changed files with 317 additions and 317 deletions
@@ -32,7 +32,7 @@ public interface Roles {
    String WELFARE_UNIT_MANAGE = "bfd195fe366e4f308230259bbe3ca9b8";

    /**
-     * 社团负责人
+     * 协会负责人
     */
    String CLUB_FZR = "c17d7a777dd24d36b4b268037b959faf";

@@ -91,7 +91,7 @@ public class SmsTemplate {
    public static final String CLUB_EXAMINE_SCHOOL_FHXG_TEMPLATE = "{}{}年度考核审核未通过，请登陆“智慧工会”进行修改补充。";

    //校工会审核完注销发送给会长
-    public static final String CLUB_EXAMINE_SCHOOL_ZX_TEMPLATE = "抱歉通知您，{}{}年度年审考核未通过！按照《中国地质大学（武汉）教职工社团管理办法》（地大工字〔2022〕17号）相关规定，该社团将予以注销，敬请知悉。";
+    public static final String CLUB_EXAMINE_SCHOOL_ZX_TEMPLATE = "抱歉通知您，{}{}年度年审考核未通过！按照《中国地质大学（武汉）教职工协会管理办法》（地大工字〔2022〕17号）相关规定，该协会将予以注销，敬请知悉。";


 }
@@ -103,7 +103,7 @@ public class Vi {
    }

    /**
-     * @return 当前登录用户的所负责的社团id
+     * @return 当前登录用户的所负责的协会id
     */
    public String getClubId() {
        Sys_user_role userRole = sysUserRoleService.fetch(Cnd.where("userId", "=", ShiroUtil.getPrincipalProperty("id")).and("roleId", "=", Roles.club01));
@@ -111,7 +111,7 @@ public class Vi {
    }

    /**
-     * @return 当前登录用户管理的协会社团
+     * @return 当前登录用户管理的协会协会
     */
    public String getMangeClubStr() {
        return "(SELECT sur.stid FROM sys_user_role sur WHERE sur.userId = '" + ShiroUtil.getPrincipalProperty("id") + "' and sur.roleId = '" + Roles.club01 + "')";
@@ -73,7 +73,7 @@ public class ClubRegistAuditState {
    public static final Integer XGH_REJECTED = 890;

    /**
-     * 待社团确定相关资料
+     * 待协会确定相关资料
     */
    public static final Integer ST_CONFIRM = 900;

@@ -40,7 +40,7 @@ public class AgendaController {
        list.add(new NutMap().addv("iconClass", "fa fa-handshake-o").addv("label", "困难帮扶申请").addv("url", "/platform/fw/difficulty/apply").addv("color", "#E0891D"));
        list.add(new NutMap().addv("iconClass", "fa el-icon-edit").addv("label", "活动报名").addv("url", "/platform/hd/hdbm").addv("color", "#3EA3B1"));
        list.add(new NutMap().addv("iconClass", "fa el-icon-edit").addv("label", "活动报销申请").addv("url", "/platform/jf/activity_bx/apply").addv("color", "#E5821B"));
-        list.add(new NutMap().addv("iconClass", "fa fa-bicycle").addv("label", "加入社团").addv("url", "/platform/sys/club/sq").addv("color", "#0294A9"));
+        list.add(new NutMap().addv("iconClass", "fa fa-bicycle").addv("label", "加入协会").addv("url", "/platform/sys/club/sq").addv("color", "#0294A9"));
        list.add(new NutMap().addv("iconClass", "fa fa-trophy").addv("label", "会籍变更").addv("url", "/platform/member/change/apply").addv("color", "#FB8C00"));
 //        list.add(new NutMap().addv("iconClass", "fa el-icon-add-location").addv("label", "活动场地预约").addv("url", "/platform/activity/site/reserve").addv("color", "#20A4C9"));
 //        list.add(new NutMap().addv("iconClass", "fa el-icon-school").addv("label", "会员高级管理").addv("url", "/platform/member/change/mange").addv("color", "#3D97BB"));
@@ -208,7 +208,7 @@ public class UnionCareDataCon {
                put("num", baseService.count(sql2));
            }});
            list.add(new HashMap<String, Object>() {{
-                put("type", "社团活动");
+                put("type", "协会活动");
                put("num", baseService.count(sql3));
            }});

@@ -259,7 +259,7 @@ public class UnionCareDataCon {

                list.add(new HashMap<String, Object>() {{
                    put("year", year);
-                    put("type", "社团活动");
+                    put("type", "协会活动");
                    put("num", sysUserService.list(sql3.setParam("year", year)).get(0).getDouble("jf"));
                }});
            }
@@ -48,7 +48,7 @@ import static org.nutz.boot.starter.ftp.FtpStarter.*;
 /**
 * @Author JyuHsin
 * @Date 2022/4/17
- * @Description 社团人数统计
+ * @Description 协会人数统计
 */
@IocBean
@At("/platform/sys/club/clubUserCount")
@@ -248,7 +248,7 @@ public class ClubUserCountController {
        cnd.andEX("c.status", "=", 5);
        sql.setCondition(cnd);
        List<NutMap> listMap = baseService.listMap(sql);
-        //获取所有社团
+        //获取所有协会
        Cnd stCnd = Cnd.NEW();
        stCnd.andEX("id", "=", clubId);
        List<Sys_club> clubList = dao.query(Sys_club.class, stCnd);
@@ -289,7 +289,7 @@ public class ClubUserCountController {
                + URLEncoder.encode("上传资料数据.zip", "UTF-8"));

        LinkedHashMap<String, List<Sys_file>> fileList = new LinkedHashMap<>();
-        //查询社团
+        //查询协会
        List<Sys_club> clubList = dao.query(Sys_club.class, Cnd.NEW().andEX("id", "=", clubId));
        clubList.forEach(item -> {
            List<Sys_file> file = new ArrayList<>();
@@ -304,7 +304,7 @@ public class ClubUserCountController {
            fileList.put(item.getId(), file);
        });

-        //社团年审附件
+        //协会年审附件
        List<sys_club_examine_register> examineList = dao.query(sys_club_examine_register.class,
                Cnd.NEW().andEX("clubId", "=", clubId)
                        .and("year(registerDate)", "=", DateUtil.thisYear()));
@@ -316,7 +316,7 @@ public class ClubUserCountController {
            }
        });

-        //社团评优附件
+        //协会评优附件
        List<SysClubEvaluate> evaluateList = dao.query(SysClubEvaluate.class, Cnd.NEW().andEX("clubId", "=", clubId)
                .and("year(applyTime)", "=", DateUtil.thisYear()));
        evaluateList.forEach(item -> {
@@ -418,16 +418,16 @@ public class ClubUserCountController {
        List<NutMap> list = baseService.listMap(sql);

        List<ExcelExportEntity> exportEntities = new ArrayList<>();
-        exportEntities.add(new ExcelExportEntity("社团名称", "name", 20));
+        exportEntities.add(new ExcelExportEntity("协会名称", "name", 20));
        exportEntities.add(new ExcelExportEntity("编码", "code", 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));
        exportEntities.add(new ExcelExportEntity("女", "woman", 20));

        try {
-            String disposition = "attachment;filename=" + URLEncoder.encode("社团统计表.xls", "utf-8");
+            String disposition = "attachment;filename=" + URLEncoder.encode("协会统计表.xls", "utf-8");
            response.setCharacterEncoding("utf-8");
            response.setContentType("application/octet-stream");
            response.setHeader("Content-Disposition", disposition);
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
 /**
 * @Author: V
 * @DateTime: 2020/8/15 14:12
- * @Description: 社团管理
+ * @Description: 协会管理
 */
@IocBean
@At("/platform/sys/club/mange")
@@ -75,7 +75,7 @@ public class SysClubCon {

    @At
    public Object updateSf(String id, Integer sf, String clubId) {
-        //查询社团是否存在会长或者秘书长
+        //查询协会是否存在会长或者秘书长
        if (sf == 1 || sf == 4) {
            int count = dao.count(Sys_club_user.class, Cnd.where("clubid", "=", clubId)
                    .and("sf", "=", sf).and("status", "!=", 4)
@@ -91,11 +91,11 @@ public class SysClubCon {
        //如果变更为会员，则直接变更
        if (sf == 2) {
            sysClubUserService.update(Chain.make("sf", sf), Cnd.where("id", "=", id));
-            //变更为会员则需要清除社团负责人角色
+            //变更为会员则需要清除协会负责人角色
            dao.clear(Sys_user_role.class, Cnd.where("stid", "=", clubId).and("userid", "=", fetch.getUserid())
                    .and("roleid", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04)));
        } else {
-            //变更社团负责人，如果是管理员直接变更完成
+            //变更协会负责人，如果是管理员直接变更完成
            if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) {
                //先清除原始身份的角色
                dao.clear(Sys_user_role.class, Cnd.where("stid", "=", clubId).and("userid", "=", fetch.getUserid())
@@ -114,11 +114,11 @@ public class SysClubCon {
                dao.update(fetch);

            } else {
-                //社团负责人变更的，则需要校工会审核
+                //协会负责人变更的，则需要校工会审核
                sysClubUserService.update(Chain.make("changeSf", sf).add("state", 1).add("sfChangeTime", DateUtil.getDateTime())
                        , Cnd.where("id", "=", id));
                //发短信
-                //查询校社团管理员
+                //查询校协会管理员
                Sql sql = Sqls.create("""
                    select
                        u.userName,
@@ -311,8 +311,8 @@ public class SysClubCon {
                        if (Strings.isNotBlank(v.getCode())) {
                            Sys_club club = sysClubService.fetch(Cnd.where("code", "=", v.getCode()));
                            if (club == null) {
-                                setObj(v.getName() + "不存在请检查社团编号和社团名称");
-                                throw new RuntimeException(v.getName() + "不存在请检查社团编号和社团名称");
+                                setObj(v.getName() + "不存在请检查协会编号和协会名称");
+                                throw new RuntimeException(v.getName() + "不存在请检查协会编号和协会名称");
                            }
                            Sys_user user = baseService.dao().fetch(Sys_user.class, Cnd.where("loginname", "=", v.getLoginname()));

@@ -323,8 +323,8 @@ public class SysClubCon {
                            }
                            Sys_club_user sys_club_user = sysClubUserService.fetch(Cnd.where("userid", "=", user.getId()).and("clubid", "=", club.getId()));
                            if (sys_club_user != null) {
-                                setObj(v.getIndex() + "行数据用户已加入了" + v.getName() + "社团请删除后在导入");
-                                throw new RuntimeException(v.getIndex() + "行数据用户已加入了" + v.getName() + "社团请删除后在导入");
+                                setObj(v.getIndex() + "行数据用户已加入了" + v.getName() + "协会请删除后在导入");
+                                throw new RuntimeException(v.getIndex() + "行数据用户已加入了" + v.getName() + "协会请删除后在导入");
                            }
                            Sys_club_user club_user = new Sys_club_user();
                            club_user.setClubid(club.getId());
@@ -39,7 +39,7 @@ import java.util.List;
 /**
 * @Author: V
 * @DateTime: 2020/8/17 14:03
- * @Description: 社团成员管理
+ * @Description: 协会成员管理
 */
@IocBean
@At("/platform/sys/club/users")
@@ -77,7 +77,7 @@ public class SysClubUserCon {
    private MsgApi msgApi;

    /**
-     * 获取我负责的社团
+     * 获取我负责的协会
     *
     * @return
     */
@@ -95,8 +95,8 @@ public class SysClubUserCon {
    }

    /**
-     * type=1社团信息管理菜单
-     * type=2社团录入菜单
+     * type=1协会信息管理菜单
+     * type=2协会录入菜单
     * type=3综合录入菜单
     */
    @At
@@ -151,7 +151,7 @@ public class SysClubUserCon {
        if (radioType != null && 1 == radioType) {
            cnd.and("scu.sf", "!=", "2");
        }
-        //查询社团成员
+        //查询协会成员
        if (radioType != null && 2 == radioType) {
            cnd.and("scu.sf", "=", "2");
        }
@@ -183,7 +183,7 @@ public class SysClubUserCon {
    public Object delUser(String id, Integer sf) {
        Sys_club_user fetch = dao.fetch(Sys_club_user.class, id);
        sysClubUserService.clear(Cnd.where("id", "=", id));
-        //删除社团负责人的角色
+        //删除协会负责人的角色
        sysUserRoleService.clear(Cnd.NEW().and("userId", "=", fetch.getUserid())
                .and("roleId", "=", getRoleId(sf)).and("stid", "=", fetch.getClubid()));
        sysUserService.clearCache();
@@ -228,7 +228,7 @@ public class SysClubUserCon {
    @RequiresAuthentication
    public Object doAddUser(String clubid, String[] users, Integer sf, Boolean isjf) {

-        //查询社团是否存在会长或者秘书长
+        //查询协会是否存在会长或者秘书长
        if (sf == 1 || sf == 4) {
            int count = dao.count(Sys_club_user.class, Cnd.where("clubid", "=", clubid)
                    .and("sf", "=", sf).and("status", "!=", 4)
@@ -247,7 +247,7 @@ public class SysClubUserCon {
            status = 3;
        }

-        //查询校社团管理员
+        //查询校协会管理员
        Sql sql = Sqls.create("""
                select
                    u.userName,
@@ -203,7 +203,7 @@ public class ClubApplyAuditController {
        return null;
    }

-    //获取当前登录用户负责的社团
+    //获取当前登录用户负责的协会
    @At
    @ViReturn
    @RequiresAuthentication
@@ -254,7 +254,7 @@ public class ClubApplyAuditController {
        return sysClubService.listPage(pageNumber, pageSize, sql);
    }

-    //获取社团已审或者未审人员
+    //获取协会已审或者未审人员
    @At
    @ViReturn
    @RequiresAuthentication
@@ -152,7 +152,7 @@ public class ClubApplyInController {
        //完成申请人的任务（申请拒绝的情况）
        ClubUserApplyToDoHandler.COMPLETE_APPLY_TASK.exec(clubUser);

-        //根据社团id查询社团负责人，发短信
+        //根据协会id查询协会负责人，发短信
        Sql sql = Sqls.create("""
                SELECT
                    u.loginname as loginName,
@@ -206,7 +206,7 @@ public class ClubApplyInController {
        //撤销删除待办流程
        ClubUserApplyToDoHandler.DELETE_PROCESS.exec(dao.fetch(Sys_club_user.class, Cnd.where("clubid", "=", id).and("userid", "=", ShiroUtil.getPlatformUid())));
        sysClubUserService.clear(Cnd.where("clubid", "=", id).and("userid", "=", ShiroUtil.getPlatformUid()));
-        //撤销给社团负责人发短信
+        //撤销给协会负责人发短信
        Sql sql = Sqls.create("""
                SELECT
                    u.loginname as loginName,
@@ -240,7 +240,7 @@ public class ClubApplyInController {
    }

    /**
-     * 获取当前登录用户已经参加的社团
+     * 获取当前登录用户已经参加的协会
     *
     * @return java.lang.Object
     * @author JyuHsin
@@ -32,7 +32,7 @@ import java.util.List;
 /**
 * @Author JyuHsin
 * @Date 2023/3/31
- * @Description 社团评优申请
+ * @Description 协会评优申请
 */
@IocBean
@At("/platform/sys/club/clubEvaluateApply")
@@ -86,7 +86,7 @@ public class ClubEvaluateApplyController {
        return null;
    }

-    //获取当前登录用户管理的社团并且年度审核通过的
+    //获取当前登录用户管理的协会并且年度审核通过的
    @At
    @ViReturn
    @RequiresAuthentication
@@ -57,7 +57,7 @@ public class ClubEvaluateHzAuditController {
                           @Param(value = "isAudit", required = false) Boolean isAudit) {
        Cnd cnd = Cnd.NEW();
        if (!ShiroUtil.hasRole("sysadmin")){
-            //查询当前登录用户是哪个社团的秘书长
+            //查询当前登录用户是哪个协会的秘书长
            cnd.and("ce.clubId", "in", "(select stid from sys_user_role where userid='%s' and roleid='%s')"
                    .formatted(ShiroUtil.getPrincipalProperty("id"), Roles.club01));
        }
@@ -56,7 +56,7 @@ public class ClubEvaluateMszAuditController {
                           @Param(value = "isAudit", required = false) Boolean isAudit) {
        Cnd cnd = Cnd.NEW();
        if (!ShiroUtil.hasRole("sysadmin")){
-            //查询当前登录用户是哪个社团的秘书长
+            //查询当前登录用户是哪个协会的秘书长
            cnd.and("ce.clubId", "in", "(select stid from sys_user_role where userid='%s' and roleid='%s')"
                    .formatted(ShiroUtil.getPrincipalProperty("id"), Roles.club03));
        }
@@ -48,7 +48,7 @@ public class ClubExamineRegisterAgentController {
    @ViReturn
    @RequiresAuthentication
    public Object getAgenda() {
-        final String title = "【社团年度审核】";
+        final String title = "【协会年度审核】";
        List<NutMap> result = new ArrayList<>();


@@ -51,7 +51,7 @@ public class ClubExamineRegisterController {
    @RequiresAuthentication
    public Object getClubUserNum(String clubId) {
        if (Strings.isBlank(clubId)) {
-            return Result.error("暂无社团无法查询成员变化情况");
+            return Result.error("暂无协会无法查询成员变化情况");
        }
        return Result.success(clubExamineRegisterService.getClubUserNum(clubId));
    }
@@ -127,7 +127,7 @@ public class ClubExamineRegisterController {
     * @param id
     * @return java.lang.Object
     * @author zhf
-     * @description找出社团会费收入
+     * @description找出协会会费收入
     */
    @At
    @ViReturn
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;

 /**
 * @ClassName ClubExamineRegisterFzrAuditController
- * @Description TODO社团负责人审核
+ * @Description TODO协会负责人审核
 * @Author zhf
 * @Date 2023/3/27 18:10
 */
@@ -162,7 +162,7 @@ public class ClubExamineRegisterManageController {
                .bind("activityQk", activityQk).build();

        try {
-            String fileName = Globals.MyConfig.getString("GxName") + "教职工社团年度考核登记表";
+            String fileName = Globals.MyConfig.getString("GxName") + "教职工协会年度考核登记表";
            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());
@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
 /**
 * @Author JyuHsin
 * @Date 2022/4/14
- * @Description 社团信息维护
+ * @Description 协会信息维护
 */
@IocBean
@At("/platform/sys/club/clubInfoManage")
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
@Ok("json")
 public class ClubNeedItemsController {

-    //社团注册
+    //协会注册
    private static final String CLUB_REGIST_XT = "/platform/sys/club/xtAudit";
    private static final String CLUB_REGIST_FZX = "/platform/sys/club/xldAudit";
    private static final String CLUB_REGIST_XGH = "/platform/sys/club/xghReply";
@@ -34,10 +34,10 @@ public class ClubNeedItemsController {
    //申请入会
    private static final String CLUB_APPLY_HZ = "/platform/sys/club/sh/clubsh";

-    //社团管理
+    //协会管理
    private static final String CLUB_MANAGE_SCHOOL = "/platform/sys/club/clubManagePersonAudit";

-    //社团评优
+    //协会评优
    private static final String CLUB_EVALUATE_MSZ = "/platform/sys/club/clubEvaluateMszAudit";
    private static final String CLUB_EVALUATE_HZ = "/platform/sys/club/clubEvaluateHzAudit";
    private static final String CLUB_EVALUATE_SCHOOL = "/platform/sys/club/clubEvaluateSchoolAudit";
@@ -51,7 +51,7 @@ public class ClubNeedItemsController {
    @ViReturn
    @RequiresAuthentication
    public Object getClubRegistAgent() {
-        final String title = "【社团注册申请】";
+        final String title = "【协会注册申请】";
        List<NutMap> result = new ArrayList<>();

        result.add(new NutMap().setv("title", title).setv("url", CLUB_REGIST_XT).setv("iconClass", vi.getIconByPath(CLUB_REGIST_XT)).setv("label", "待宣体办公室审核").setv("number", getClubRegistCount(false, "", 810)));
@@ -80,7 +80,7 @@ public class ClubNeedItemsController {
    @ViReturn
    @RequiresAuthentication
    public Object getClubApplyAgent() {
-        final String title = "【社团入会申请】";
+        final String title = "【协会入会申请】";
        List<NutMap> result = new ArrayList<>();

        result.add(new NutMap().setv("title", title).setv("url", CLUB_APPLY_HZ).setv("iconClass", vi.getIconByPath(CLUB_APPLY_HZ)).setv("label", "待会长审核").setv("number", getClubApplyCount(Roles.club01, 1)));
@@ -109,7 +109,7 @@ public class ClubNeedItemsController {
    @ViReturn
    @RequiresAuthentication
    public Object getClubManageAgent() {
-        final String title = "【社团理事成员】";
+        final String title = "【协会理事成员】";
        List<NutMap> result = new ArrayList<>();

        result.add(new NutMap().setv("title", title).setv("url", CLUB_MANAGE_SCHOOL).setv("iconClass", vi.getIconByPath(CLUB_MANAGE_SCHOOL)).setv("label", "待校工会审核").setv("number", getClubManageCount()));
@@ -130,7 +130,7 @@ public class ClubNeedItemsController {
    @ViReturn
    @RequiresAuthentication
    public Object getClubEvaluateAgent() {
-        final String title = "【社团评优】";
+        final String title = "【协会评优】";
        List<NutMap> result = new ArrayList<>();

        result.add(new NutMap().setv("title", title).setv("url", CLUB_EVALUATE_MSZ).setv("iconClass", vi.getIconByPath(CLUB_EVALUATE_MSZ)).setv("label", "待秘书长审核").setv("number", getClubEvaluateCount(true, Roles.club03, 2010)));
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 /**
 * @Author JyuHsin
 * @Date 2022/4/14
- * @Description 社团确认
+ * @Description 协会确认
 */
@IocBean
@At("/platform/sys/club/clubConfirm")
@@ -31,7 +31,7 @@ import java.util.Objects;
 /**
 * @Author JyuHsin
 * @Date 2022/4/14
- * @Description 社团注册申请
+ * @Description 协会注册申请
 */
@IocBean
@At("/platform/sys/club/clubRegistApply")
@@ -89,7 +89,7 @@ public class ClubRegistApplyController {

        Sys_club sysClub = sysClubService.insertWith(club, "sponsors");

-        //插入新建社团时填入的理事机构
+        //插入新建协会时填入的理事机构
        List<Sys_club_user> clubUsers = new ArrayList<>();

        List<Sys_user_role> userRoles = new ArrayList<>();
@@ -106,7 +106,7 @@ public class ClubRegistApplyController {
                cUser.setIsNormal(true);
                clubUsers.add(cUser);

-                //如果是管理员创建的社团，直接加角色
+                //如果是管理员创建的协会，直接加角色
                if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) {
                    Sys_user_role uRole = new Sys_user_role();
                    uRole.setUserId(item.getString("userId"));
@@ -184,7 +184,7 @@ public class ClubRegistApplyController {
            }
            clubUsers.add(cUser);

-            //如果是管理员创建的社团，直接加角色
+            //如果是管理员创建的协会，直接加角色
            if(ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") && Objects.equals(club.getState(), ClubRegistAuditState.SCHOOL_PASS)) {
                Sys_user_role uRole = new Sys_user_role();
                uRole.setUserId(item.getString("userId"));
@@ -22,7 +22,7 @@ public class SysClubEvaluate {
    private String id;

    @Column
-    @Comment("社团id")
+    @Comment("协会id")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String clubId;

@@ -16,7 +16,7 @@ public class SysClubUserHistory extends BaseModel {
    private String id;

    @Column
-    @Comment("社团id")
+    @Comment("协会id")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String clubId;

@@ -26,7 +26,7 @@ public class SysClubUserHistory extends BaseModel {
    private String userId;

    @Column
-    @Comment("用户备份时的社团身份")
+    @Comment("用户备份时的协会身份")
    @ColDefine(type = ColType.INT)
    private Integer sf;

@@ -8,7 +8,7 @@ import java.util.List;
 /**
 * @Author: V
 * @DateTime: 2020/8/15 13:52
- * @Description: 社团
+ * @Description: 协会
 */
@Data
@Table("Sys_club")
@@ -22,17 +22,17 @@ public class Sys_club {
    private String id;

    @Column
-    @Comment("社团名称")
+    @Comment("协会名称")
    @ColDefine(type = ColType.VARCHAR, width = 100)
    private String name;

    @Column
-    @Comment("社团编码")
+    @Comment("协会编码")
    @ColDefine(type = ColType.VARCHAR, width = 100)
    private String code;

    @Column
-    @Comment("社团类型")
+    @Comment("协会类型")
    @ColDefine(type = ColType.VARCHAR, width = 30)
    private String type;

@@ -52,12 +52,12 @@ public class Sys_club {
    private String concatPersonEmail;

    @Column
-    @Comment("社团介绍")
+    @Comment("协会介绍")
    @ColDefine(type = ColType.TEXT)
    private String stjs;

    @Column
-    @Comment("社团宗旨")
+    @Comment("协会宗旨")
    @ColDefine(type = ColType.TEXT)
    private String stzz;

@@ -12,7 +12,7 @@ import java.util.List;
 /**
 * @Author: V
 * @DateTime: 2020/8/15 16:39
- * @Description: 社团成员
+ * @Description: 协会成员
 */
@EqualsAndHashCode(callSuper = true)
@Data
@@ -27,7 +27,7 @@ public class Sys_club_user extends BaseModel {
    private String id;

    @Column
-    @Comment("社团id")
+    @Comment("协会id")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String clubid;

@@ -67,12 +67,12 @@ public class Sys_club_user extends BaseModel {
    private String yearClubAuditId;

    @Column
-    @Comment("年审状态（1 待社团审核 2 社团审核不通过 5 通过）")
+    @Comment("年审状态（1 待协会审核 2 协会审核不通过 5 通过）")
    @ColDefine(type = ColType.INT, width = 4)
    private Integer yearAuditStatus;

    @Column
-    @Comment("状态（1 待社团审核 2 社团审核不通过 3 待校工会审核 4 校工会审核不通过 5 通过）")
+    @Comment("状态（1 待协会审核 2 协会审核不通过 3 待校工会审核 4 校工会审核不通过 5 通过）")
    @ColDefine(type = ColType.INT, width = 4)
    private Integer status;

@@ -72,7 +72,7 @@ public class Sys_user_role implements Serializable {

    @Column
    @ColDefine(type = ColType.VARCHAR, width = 32)
-    @Comment("社团id")
+    @Comment("协会id")
    private String stid;

    @Column
@@ -29,12 +29,12 @@ public class sys_club_examine_register {
    private String userId;

    @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;

@@ -84,7 +84,7 @@ public class sys_club_examine_register {
    private int auditId;

    @Column
-    @Comment("社团负责人审核意见id")
+    @Comment("协会负责人审核意见id")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String stAuditId;

@@ -14,7 +14,7 @@ public interface ClubExamineRegisterService extends ViService {
     * @param clubId
     * @return java.util.List<org.nutz.lang.util.NutMap>
     * @author zhf
-     * @description 社团成员变化情况
+     * @description 协会成员变化情况
     */
    List<NutMap> getClubUserNum(String clubId);

@@ -32,7 +32,7 @@ public interface ClubExamineRegisterService extends ViService {
     * @param id
     * @return java.lang.Object
     * @author zhf
-     * @description找出社团会费收入
+     * @description找出协会会费收入
     */
    Object getClubMemberMoney(String id);

@@ -22,7 +22,7 @@ import java.util.Map;
 import java.util.stream.Collectors;

 /**
- * 每天晚上23:59:59查询社团名单，如果在职变为拨付，如果退休变为不拨付
+ * 每天晚上23:59:59查询协会名单，如果在职变为拨付，如果退休变为不拨付
 * 如果时间为每年的12月31日，则备份一次所有拨付名单
 */
@IocBean
@@ -40,7 +40,7 @@ public class ClubUserJob implements Job {

        List<Sys_user> userList = dao.query(Sys_user.class, Cnd.NEW());
        Map<String, Sys_user> userMap = userList.stream().collect(Collectors.toMap(Sys_user::getId, o -> o));
-        //查询所有社团名单
+        //查询所有协会名单
        List<Sys_club_user> clubUserList = dao.query(Sys_club_user.class, Cnd.where("status", "=", 5)
                .and("isNormal", "=", true)
                .and(new Static(" clubid in (select id from sys_club where isjs = false and state = %s)".formatted(ClubRegistAuditState.SCHOOL_PASS))));
@@ -53,12 +53,12 @@ public class ActivityPlan {
    private Double money;

    @Column
-    @Comment("计划类型(1-校活动、2-分工会活动、3协会社团活动)")
+    @Comment("计划类型(1-校活动、2-分工会活动、3协会协会活动)")
    @ColDefine(type = ColType.VARCHAR, width = 7)
    private String type;

    @Column
-    @Comment("分工会ID或社团ID")
+    @Comment("分工会ID或协会ID")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String tissueId;

@@ -158,7 +158,7 @@ public class ActivitySchool extends BaseModel implements Serializable {
    private Boolean close;

    @Column
-    @Comment("活动级别（40001-校级、40002-分工会、40003-社团或协会）")
+    @Comment("活动级别（40001-校级、40002-分工会、40003-协会或协会）")
    @ColDefine(type = ColType.INT, width = 10)
    private Integer activityLevel;

@@ -182,7 +182,7 @@ public class ActivitySchool extends BaseModel implements Serializable {
    private String belongUnionId;

    @Column
-    @Comment("活动所属社团")
+    @Comment("活动所属协会")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String belongClubId;

@@ -17,12 +17,12 @@ import java.util.List;
 /**
 * @author: Aaron
 * @create: 2021-03-09 13:57
- * @description: 社团或分工会活动校工会活动
+ * @description: 协会或分工会活动校工会活动
 **/

@Data
@Table("activity_tissue")
-@Comment("社团或分工会活动校工会活动")
+@Comment("协会或分工会活动校工会活动")
 public class ActivityTissue extends BaseModel implements Serializable, SysHomeConvert {

    @Column
@@ -138,7 +138,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
    private String unionId;

    @Column
-    @Comment("创建人所属社团")
+    @Comment("创建人所属协会")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String clubId;

@@ -22,7 +22,7 @@ public class ActivityTissuePerson {
    private String id;

    @Column
-    @Comment("分工会或社团活动ID")
+    @Comment("分工会或协会活动ID")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String tissueId;

@@ -44,7 +44,7 @@ public class ActivityYearSummary {
    private String summaryType;

    @Column
-    @Comment("总结来源（1-校活动、2-分工会活动、3协会社团活动）")
+    @Comment("总结来源（1-校活动、2-分工会活动、3协会协会活动）")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String summaryFrom;

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;

 /**
 * @Author:xsb
- * @Description: 社团模板数据导入
+ * @Description: 协会模板数据导入
 * @Date:Created in 19:45 2021/2/1
 */
@IocBean
@@ -40,10 +40,10 @@ import java.util.stream.Collectors;
 public class ClubDataInputController {


-    @Inject  // 已交社团
+    @Inject  // 已交协会
    private jfClubService jfClubService;

-    @Inject  // 系统原本社团
+    @Inject  // 系统原本协会
    private SysClubService sysClubService;


@@ -65,7 +65,7 @@ public class ClubDataInputController {
            file = new File("src/main/resources/docTemplate/clubQuota.xlsx");
            fin = new FileInputStream(file);
            // 设置浏览器以下载的方式处理该文件名
-            String fileName = "批量导入社团预算分配" + ".xlsx";
+            String fileName = "批量导入协会预算分配" + ".xlsx";
            response.setHeader("Content-Disposition", "attachment;filename="
                    .concat(String.valueOf(URLEncoder.encode(fileName, "UTF-8"))));

@@ -92,9 +92,9 @@ public class ClubDataInputController {
        int count = 0;
        int success_count = 0;
        try {
-            // 查出现在已交社团表中的已交社团
+            // 查出现在已交协会表中的已交协会
            List<jf_club> jf_clubs = jfClubService.query();
-            // 查出所有系统社团
+            // 查出所有系统协会
            List<Sys_club> sysClubs = sysClubService.query();
            Map<String, String> collect = sysClubs.stream().collect(Collectors.toMap(v -> v.getName(), v -> v.getId()));
            //获得excel表格中的数据并封装成一个个对象
@@ -111,10 +111,10 @@ public class ClubDataInputController {

                    jf_club yj_club = jf_clubs.stream().filter(v -> v.getYear().equals(obj.getYear()) && v.getClub_id().equals(obj.getClub_id())).findFirst().orElse(null);

-                    // 遍历所有的已交社团
+                    // 遍历所有的已交协会
                    boolean has = jf_clubs.stream().anyMatch(v -> v.getYear().equals(obj.getYear()) && v.getClub_id().equals(obj.getClub_id()));
                    if (has) {
-                        yj_club.setClub_id(obj.getClub_id()); //社团id
+                        yj_club.setClub_id(obj.getClub_id()); //协会id
                        yj_club.setState(1); //状态1
                        yj_club.setHistory_member(obj.getHistory_member()); //历史会员人数
                        yj_club.setHistory_club_avg(obj.getHistory_club_avg()); //历史品均值
@@ -30,7 +30,7 @@ import java.util.List;
 /**
 * @author zhf
 * @date 2020/11/5 10:24
- * @description 社团活动经费分配
+ * @description 协会活动经费分配
 */
@IocBean
@At("/platform/jf/st/fp")
@@ -133,7 +133,7 @@ public class ActivityReimbursementBoardController {

                list.add(new NutMap() {{
                    put("year", year);
-                    put("type", "社团活动");
+                    put("type", "协会活动");
                    put("num", activityBxService.count(sql3.setParam("year", year)));
                }});
            }
@@ -164,7 +164,7 @@ public class ActivityReimbursementBoardController {
                put("num", activityBxService.count(sql2));
            }});
            list.add(new NutMap() {{
-                put("type", "社团活动");
+                put("type", "协会活动");
                put("num", activityBxService.count(sql3));
            }});
            return Result.success().addData(list);
@@ -207,7 +207,7 @@ public class ActivityReimbursementBoardController {

                list.add(new NutMap() {{
                    put("year", year);
-                    put("type", "社团经费");
+                    put("type", "协会经费");
                    put("num", activityBxService.list(sql3.setParam("year", year)).get(0).getDouble("jf"));
                }});
            }
@@ -237,7 +237,7 @@ public class ActivityReimbursementBoardController {
                put("num", activityBxService.count(unionSql));
            }});
            list.add(new NutMap() {{
-                put("type", "社团经费");
+                put("type", "协会经费");
                put("num", activityBxService.count(clubSql));
            }});
            return Result.success().addData(list);
@@ -164,7 +164,7 @@ public class ActivityBx {
    private Integer apply_type;

    @Column
-    @Comment("活动类型（1.基层工会，3.校工会，2.社团）")
+    @Comment("活动类型（1.基层工会，3.校工会，2.协会）")
    @ColDefine(type = ColType.INT, width = 10)
    private Integer activity_type;

@@ -9,7 +9,7 @@ import java.io.Serializable;
 /**
 * @author: Aaron
 * @create: 2020-08-18 15:01
- * @description: 社团预算管理
+ * @description: 协会预算管理
 **/
@Table("jf_club")
@Data
@@ -26,7 +26,7 @@ public class jf_club implements Serializable {


    @Column
-    @Comment("社团ID")
+    @Comment("协会ID")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String club_id;

@@ -37,7 +37,7 @@ public class jf_club implements Serializable {
    private Integer year;

    @Column
-    @Comment("社团活动费")
+    @Comment("协会活动费")
    @ColDefine(type = ColType.INT)
    private Integer club_activity_cost;

@@ -228,7 +228,7 @@ public class applyNewController {
            int count = baseService.dao().count(Sys_club_user.class, Cnd.where("userid", "=", ShiroUtil.getPrincipalProperty("id"))
                    .and("sf", "=", 1));
            if (count == 0) {
-                return Result.error("协会/社团报销只能由会长操作");
+                return Result.error("协会/协会报销只能由会长操作");
            }
        }
        return Result.success();
@@ -60,7 +60,7 @@ public class ReimbursementNew {
    private String unitId;

    @Column
-    @Comment("社团id")
+    @Comment("协会id")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String clubId;

@@ -299,7 +299,7 @@ public class ReimbursementNew {
    private String activity_number;

    @Column
-    @Comment("活动类型（1.基层工会，2.校工会，3.社团）")
+    @Comment("活动类型（1.基层工会，2.校工会，3.协会）")
    @ColDefine(type = ColType.INT, width = 2)
    private Integer activity_type;

@@ -86,7 +86,7 @@ public class XhKhZpController {


    /**
-     * 查社团名称
+     * 查协会名称
     * @return
     */
    @At