c-zhouhf1/zhgh_cug
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
@jyuhsin
2026-03-31 16:55:35 +08:00
parent dc71dc22d8
commit 6adf949e3e
184 changed files with 2333 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserClubListController.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class ClubUserClubListController {
@At
@SaCheckPermission("club.join.list")
public Result getCount() {
// 获取所有协会
// 获取所有社团
List<SysClub> list = sysClubService.query();
// 获取审核通过的
List<ProcessInstance> instanceList = sysClubService.dao().query(
src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java
+10 -8
View File
@@ -50,7 +50,7 @@ import java.util.List;
@IocBean
@At("/platform/club/join/apply")
@Api("协会申请入会、退会")
@Api("社团申请入会、退会")
@Ok("json:full")
public class ClubUserJoinApplyController {
@@ -107,7 +107,7 @@ public class ClubUserJoinApplyController {
@At
@ApiOperation("保存申请")
@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(true);
@@ -120,7 +120,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(mode == false) {
@@ -134,12 +134,14 @@ public class ClubUserJoinApplyController {
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 (!List.of(ProcessInstanceStateEnum.REJECT.getCode(), ProcessInstanceStateEnum.FINISHED.getCode()).contains(processInstance.getState())) {
return Result.error("您有该协会的申请记录尚未完成，请到我的申请里查看！");
if (processInstance != null && !List.of(ProcessInstanceStateEnum.REJECT.getCode(), ProcessInstanceStateEnum.FINISHED.getCode()).contains(processInstance.getState())) {
return Result.error("您有该社团的申请记录尚未完成，请到我的申请里查看！");
}
}
clubUserApply.setId(null);
if(!mode) {
clubUserApply.setId(null);
}
clubUserApply.setRoleCode(RoleConstant.CLUB_MEMBER.name());
clubUserApply.setMode(mode);
clubUserApply.setApplyDate(new Date());
@@ -176,7 +178,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) {
View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
@@ -196,7 +198,7 @@ public class ClubUserJoinApplyController {
ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", userApply.getId()));
if (!List.of(ProcessInstanceStateEnum.REJECT.getCode(), ProcessInstanceStateEnum.FINISHED.getCode()).contains(processInstance.getState())) {
return Result.error(99, "您有该协会的申请记录尚未完成，请到我的申请里查看！");
return Result.error(99, "您有该社团的申请记录尚未完成，请到我的申请里查看！");
}
return Result.success();
}
src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java
+1 -2
View File
@@ -79,7 +79,6 @@ public class ClubUserJoinMineController {
t.finishTime,
t.taskParentId,
t.variable taskVariable,
IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
(select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
FROM
@@ -106,7 +105,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);
src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateApplyController.java
+2 -2
View File
@@ -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);
src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateMineController.java
+1 -1
View File
@@ -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);
src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineApplyController.java
+7 -7
View File
@@ -71,7 +71,7 @@ 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("年份信息为空，请核查");
@@ -96,7 +96,7 @@ public class ClubExamineApplyController {
@SaCheckLogin
public Result getClubUserNum(String clubId, Integer year) {
if(StrUtil.isBlank(clubId)) {
return Result.error("协会信息为空，请核查");
return Result.error("社团信息为空，请核查");
}
List<NutMap> result = sysClubExamineService.getClubUserNum(clubId, year);
return Result.success(result);
@@ -106,7 +106,7 @@ public class ClubExamineApplyController {
@SaCheckLogin
public Result getJgUser(String clubId) {
if(StrUtil.isBlank(clubId)) {
return Result.error("协会信息为空，请核查");
return Result.error("社团信息为空，请核查");
}
List<NutMap> result = sysClubExamineService.getJgUser(clubId);
return Result.success(result);
@@ -116,7 +116,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);
@@ -141,7 +141,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)
.and("YEAR(registerDate)", "=", DateUtil.thisYear() - 1));
@@ -167,7 +167,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) {
@@ -182,7 +182,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) {
src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineMineController.java
+1 -1
View File
@@ -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));
src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubChangeManagerController.java
+2 -2
View File
@@ -128,7 +128,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) {
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
@@ -188,7 +188,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);
src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java
+10 -10
View File
@@ -104,7 +104,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();
@@ -113,7 +113,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();
@@ -122,7 +122,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();
@@ -131,7 +131,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) {
ClubUser clubUser = dao.fetch(ClubUser.class, id);
dao.delete(ClubUser.class,id);
@@ -152,7 +152,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);
@@ -193,7 +193,7 @@ 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<String> roleCodeList = Arrays.asList(roleCodes);
//查询社团是否存在会长或者秘书长
@@ -269,7 +269,7 @@ 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) {
//查询社团是否存在会长或者秘书长
@@ -326,9 +326,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();
}
@@ -359,7 +359,7 @@ public class ClubInfoManageController {
continue;
}
if (clubUsers.stream().anyMatch(s -> s.getUserId().equals(user.getId()))) {
v.setErrorInfo("该用户已加入该协会");
v.setErrorInfo("该用户已加入该社团");
errorInfos.add(v);
continue;
}
src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubPayRecordController.java
+3 -3
View File
@@ -44,7 +44,7 @@ import java.util.Optional;
@Slf4j
@IocBean
@Ok("json:full")
@Api(tags = "协会缴费记录")
@Api(tags = "社团缴费记录")
@At("/platform/club/pay")
public class ClubPayRecordController {
@@ -159,9 +159,9 @@ public class ClubPayRecordController {
}
@At
@ApiOperation("修改协会成员缴费状态")
@ApiOperation("修改社团成员缴费状态")
@SaCheckPermission("club.infoManage.pay")
@SLog(tag = "协会管理系统-缴费记录", msg = "修改协会成员缴费状态")
@SLog(tag = "社团管理系统-缴费记录", msg = "修改社团成员缴费状态")
public Result handle(@Param("ids") String[] ids,
@Param("payed") Boolean payed) {
List<ClubPayRecord> list = payRecordService.query(Cnd.where("id", "in", ids));
src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java
+4 -3
View File
@@ -106,6 +106,7 @@ public class ClubRefreshReportController {
} else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
}
cnd.groupBy("info.id");
sql.setCondition(cnd);
Pagination pagination = clubInfoManageService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination);
@@ -114,7 +115,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();
@@ -125,7 +126,7 @@ public class ClubRefreshReportController {
List<String> 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());
@@ -167,7 +168,7 @@ 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) {
clubInfoManageService.dao().delete(SysClubRefresh.class, id);
flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java
+4 -3
View File
@@ -107,6 +107,7 @@ public class ClubRuleUpdateController {
} else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
}
cnd.groupBy("info.id");
sql.setCondition(cnd);
Pagination pagination = clubInfoManageService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination);
@@ -115,7 +116,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();
@@ -126,7 +127,7 @@ public class ClubRuleUpdateController {
List<String> 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());
@@ -168,7 +169,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);
src/main/java/com/budwk/app/zhgh/club/controller/register/ClubConfirmController.java
+1 -1
View File
@@ -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")
src/main/java/com/budwk/app/zhgh/club/controller/register/ClubMyApplyController.java
+3 -3
View File
@@ -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));
src/main/java/com/budwk/app/zhgh/club/controller/register/ClubRegistApplyController.java
+2 -2
View File
@@ -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<String> deleteIds,
@Param("::managePerson") List<NutMap> 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<String> deleteIds,
@Param("::managePerson") List<NutMap> managePerson) {
src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java
+1 -1
View File
@@ -279,7 +279,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
src/main/java/com/budwk/app/zhgh/club/interceptor/ClubRefreshUpdateInterceptor.java
+1 -1
View File
@@ -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);
src/main/java/com/budwk/app/zhgh/club/interceptor/ClubRuleUpdateInterceptor.java
+1 -1
View File
@@ -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);
src/main/java/com/budwk/app/zhgh/club/interceptor/ClubUserJoinInterceptor.java
+3 -3
View File
@@ -42,12 +42,12 @@ public class ClubUserJoinInterceptor implements FlowInterceptor {
// 获取操作类
Dao dao = ServiceContext.find(Dao.class);
// 将申请信息复制一份，插入协会成员表
// 将申请信息复制一份，插入社团成员表
ClubUser clubUser = BeanUtil.copyProperties(clubUserApply, ClubUser.class);
dao.insert(clubUser);
// 还要加到协会成员缴费表中
// 对了，如果同一个人，在同一年，多次加入同一协会，则只插入一条
// 还要加到社团成员缴费表中
// 对了，如果同一个人，在同一年，多次加入同一社团，则只插入一条
ClubPayRecord payRecord = dao.fetch(
ClubPayRecord.class,
Cnd.where(ClubPayRecord::getClubId, "=", clubUser.getClubId())
src/main/java/com/budwk/app/zhgh/club/model/ClubPayRecord.java
+2 -2
View File
@@ -20,7 +20,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table("club_pay_record")
@TableMeta("{'mysql-charset':'utf8mb4'}")
@Comment("协会会员缴费记录表")
@Comment("社团会员缴费记录表")
public class ClubPayRecord extends BaseModel {
@Name
@@ -35,7 +35,7 @@ public class ClubPayRecord extends BaseModel {
private Integer year;
@Column
@Comment("协会ID")
@Comment("社团ID")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String clubId;
src/main/java/com/budwk/app/zhgh/club/model/ClubUser.java
+4 -4
View File
@@ -13,7 +13,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table("club_user")
@TableMeta("{'mysql-charset':'utf8mb4'}")
@Comment("协会会员表")
@Comment("社团会员表")
public class ClubUser extends BaseModel {
@Name
@@ -23,7 +23,7 @@ public class ClubUser extends BaseModel {
private String id;
@Column
@Comment("协会ID")
@Comment("社团ID")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String clubId;
@@ -38,7 +38,7 @@ public class ClubUser extends BaseModel {
private List<String> roleCode = new ArrayList<>();
@Column
@Comment("协会职务")
@Comment("社团职务")
@ColDefine(type = ColType.VARCHAR, width = 50)
private String clubPosition;
@@ -53,7 +53,7 @@ public class ClubUser extends BaseModel {
private String avatar;
@Column
@Comment("同时参加其他协会情况")
@Comment("同时参加其他社团情况")
@ColDefine(type = ColType.VARCHAR, width = 500)
private String sameTimeJoinOtherClubSituation;
src/main/java/com/budwk/app/zhgh/club/model/ClubUserApply.java
+4 -4
View File
@@ -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 Boolean 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;
src/main/java/com/budwk/app/zhgh/club/model/SysClub.java
+9 -9
View File
@@ -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,21 +32,21 @@ 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 = 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
@@ -65,12 +65,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;
src/main/java/com/budwk/app/zhgh/club/model/SysClubEvaluate.java
+3 -3
View File
@@ -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
src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegister.java
+1 -1
View File
@@ -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
src/main/java/com/budwk/app/zhgh/club/model/SysClubExamineRegisterDetailed.java
+1 -1
View File
@@ -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
src/main/java/com/budwk/app/zhgh/club/model/SysClubManager.java
+1 -1
View File
@@ -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
src/main/java/com/budwk/app/zhgh/club/model/SysClubRefresh.java
+1 -1
View File
@@ -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
src/main/java/com/budwk/app/zhgh/club/model/SysClubRule.java
+1 -1
View File
@@ -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
src/main/java/com/budwk/app/zhgh/club/model/SysClubSponsor.java
+3 -3
View File
@@ -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
src/main/java/com/budwk/app/zhgh/club/service/ClubPayRecordService.java
+1 -1
View File
@@ -14,7 +14,7 @@ public interface ClubPayRecordService extends BaseService<ClubPayRecord> {
/**
* 获取协会成员是否拨付
* 获取社团成员是否拨付
* @param userId
* @param clubId
*/
src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java
+7 -7
View File
@@ -56,7 +56,7 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
SysClubExamineRegister examineRegister = dao().fetch(SysClubExamineRegister.class,
Cnd.where("year", "=", year - 1).and("clubId", "=", clubId));
// 构建协会用户申请记录查询SQL（关联用户信息、流程实例）
// 构建社团用户申请记录查询SQL（关联用户信息、流程实例）
Sql sql = Sqls.create("""
SELECT
cu.*,
@@ -97,7 +97,7 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
// 初始化年末人数为0
int thisYearNum = 0;
if (!Lang.isEmpty(personTypeUsers)) {
// 统计年末人数：加入协会且无退出记录的用户数量
// 统计年末人数：加入社团且无退出记录的用户数量
List<String> exitUserIds = personTypeUsers.stream()
.filter(u -> u.getInt("mode") == 0)
.map(u -> u.getString("userId"))
@@ -174,7 +174,7 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
@Override
public List<NutMap> getJgUser(String clubId) {
// 构建协会管理人员查询SQL（排除普通成员，按职务排序）
// 构建社团管理人员查询SQL（排除普通成员，按职务排序）
Sql sql = Sqls.create("""
SELECT
cl.*,
@@ -264,13 +264,13 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
@Override
public Pagination<ClubExaminePageVo> minePageData(ClubUserPageForm pageForm) {
Cnd cnd = Cnd.NEW();
// 非系统管理员，仅查询自己管理的协会（空集合判断避免in查询异常）
// 非系统管理员，仅查询自己管理的社团（空集合判断避免in查询异常）
if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
List<SysClub> 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<>());
}
}
@@ -344,7 +344,7 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
@Override
public ClubExamineVo findOne(String id) {
// 构建单条考核登记查询SQL（关联协会、联系人信息）
// 构建单条考核登记查询SQL（关联社团、联系人信息）
Sql sql = Sqls.create("""
SELECT
scer.*,
@@ -431,7 +431,7 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
}
/**
* 构建分页查询基础条件（年度、协会ID）
* 构建分页查询基础条件（年度、社团ID）
* @param cnd 条件对象
* @param pageForm 分页参数
* @param tableAlias 表别名
src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java
+2 -2
View File
@@ -316,9 +316,9 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl<ClubCommonPage
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("clubRegis"), config).render(docData).writeAndClose(byteArrayOutputStream);
CommonDownloadUtil.download("教职工文体协会登记表(" + clubInfo.getString("clubName") + ").docx", byteArrayOutputStream.toByteArray(), response);
CommonDownloadUtil.download("教职工文体社团登记表(" + clubInfo.getString("clubName") + ").docx", byteArrayOutputStream.toByteArray(), response);
} catch (IOException e) {
log.error("协会登记表导出失败,id:{},错误信息：{}", clubId, e.getMessage());
log.error("社团登记表导出失败,id:{},错误信息：{}", clubId, e.getMessage());
}
}
}
src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java
+1 -2
View File
@@ -183,7 +183,7 @@ public class SysClubServiceImpl extends BaseServiceImpl<SysClub> implements SysC
@Override
public SysClub doEdit(SysClub club, List<String> deleteIds, List<NutMap> managePerson) {
// 修改协会表
// 修改社团表
dao().update(club);
// 修改发起人表
dao().clear(SysClubSponsor.class, Cnd.where("clubId", "=", club.getId()));
@@ -228,7 +228,6 @@ public class SysClubServiceImpl extends BaseServiceImpl<SysClub> implements SysC
t.finishTime,
t.taskParentId,
t.variable taskVariable,
IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
(select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
FROM
src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java
+1 -1
View File
@@ -149,7 +149,7 @@ public class SysClubUserServiceImpl extends BaseServiceImpl<ClubUser> implements
@Override
public void clubUser2Scope(String clubId, List<String> users) {
// 添加协会成员，需要增加到品牌活动的组别去，wcnm
// 添加社团成员，需要增加到品牌活动的组别去，wcnm
List<TrainSignUpActivity> list = dao().query(TrainSignUpActivity.class, Cnd.NEW());
List<TrainSignUpActivity> activityList = new ArrayList<>();
for (TrainSignUpActivity activity : list) {