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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-08-29 17:52:16 +08:00
parent a08ae49f03
commit 06a8e2fda4
90 changed files with 2475 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java
+2 -2
View File
@@ -96,7 +96,7 @@ public class ClubUserJoinApplyController {
@At
@ApiOperation("保存申请")
@SaCheckPermission("condolence.apply")
@SLog(type = "clubUser", tag = "保存协会入会", msg = "保存协会入会")
@SLog(tag = "协会管理系统-申请入会", msg = "保存协会入会")
public Result save(@Param("data") ClubUserApply clubUserApply) {
clubUserApply.setRoleCode(RoleConstant.CLUB_MEMBER.name());
clubUserApply.setMode(true);
@@ -109,7 +109,7 @@ public class ClubUserJoinApplyController {
@ApiOperation("提交")
@SaCheckPermission("club.join.apply")
@Aop(TransAop.READ_COMMITTED)
@SLog(type = "clubUser", tag = "申请协会入会", msg = "申请协会入会")
@SLog(tag = "协会管理系统-申请入会", msg = "申请协会入会")
public Result submit(ClubUserApply clubUserApply) {
ClubUserApply userApply = dao.fetch(ClubUserApply.class, Cnd.where("userId", "=", clubUserApply.getUserId()).and("clubId", "=", clubUserApply.getClubId()).and("mode", "=", 1).desc(ClubUserApply::getApplyDate));
if (ObjectUtil.isNotEmpty(userApply) && StrUtil.isBlank(userApply.getId())) {
src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class ClubUserJoinMineController {
@SaCheckPermission("club.join.apply")
@ApiOperation("删除")
@Aop(TransAop.READ_COMMITTED)
@SLog(type = "clubUser", 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
@@ -68,7 +68,7 @@ public class ClubEvaluateApplyController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.evaluate.apply")
@SLog(type = "evaluateApply", tag = "保存协会评优申请", msg = "保存协会评优申请")
@SLog(tag = "协会管理系统-协会评优", msg = "保存协会评优申请")
public Result save(@Param("data") SysClubEvaluate evaluate) {
evaluateService.dao().insertOrUpdate(evaluate);
return Result.success(evaluate);
@@ -77,7 +77,7 @@ public class ClubEvaluateApplyController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.evaluate.apply")
@SLog(type = "evaluateApply", 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/ClubEvaluateClubAuditController.java
+3 -3
View File
@@ -63,7 +63,7 @@ public class ClubEvaluateClubAuditController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.evaluate.clubAudit")
@SLog(type = "clubEvaluate", tag = "会长审核评优申请", msg = "会长审核评优申请", param = true)
@SLog(tag = "协会管理系统-协会评优", msg = "会长审核评优申请")
public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) {
approvalParam.getBpmTaskApprovalTypeEnum();
Map<String, Object> variables = BeanUtil.beanToMap(approvalParam);
@@ -80,8 +80,8 @@ public class ClubEvaluateClubAuditController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.evaluate.clubAudit")
@SLog(type = "clubEvaluate", tag = "会长撤回评优申请", msg = "会长撤回评优申请", param = true)
public Result revoke(@Valid String taskId) {
@SLog(tag = "协会管理系统-协会评优", msg = "会长撤回评优申请")
public Result revoke(@Valid String taskId) {
bpmService.revokeTask(taskId);
return Result.success();
}
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(type = "evaluateApply", 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
+3 -3
View File
@@ -138,7 +138,7 @@ public class ClubExamineApplyController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.examine.apply")
@SLog(type = "examineApply", tag = "保存协会年审", msg = "保存协会年审")
@SLog(tag = "协会管理系统-协会年审", msg = "保存协会年审")
public Result save(@Param("data") SysClubExamineRegister examineRegister,
@Param("incomeDetailed") String incomeDetailed,
@Param("incomeCensus") String incomeCensus) {
@@ -153,7 +153,7 @@ public class ClubExamineApplyController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.examine.apply")
@SLog(type = "examineApply", tag = "提交协会年审", msg = "提交协会年审")
@SLog(tag = "协会管理系统-协会年审", msg = "提交协会年审")
public Result submit(@Param("data") SysClubExamineRegister examineRegister,
@Param("incomeDetailed") String incomeDetailed,
@Param("incomeCensus") String incomeCensus) {
@@ -168,7 +168,7 @@ public class ClubExamineApplyController {
Dict args = Dict.create();
args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
args.set(FlowConst.FORM_DATA, reg);
ProcessInstance instance = flowEngine.startProcessInstanceByKey("XHPY", reg.getId(), SecurityUtil.getUserId(), args);
ProcessInstance instance = flowEngine.startProcessInstanceByKey("XHNS", reg.getId(), SecurityUtil.getUserId(), args);
// 自动完成第一个申请任务
List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineClubAuditController.java
+3 -3
View File
@@ -57,7 +57,7 @@ public class ClubExamineClubAuditController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.examine.clubAudit")
@SLog(type = "clubExamine", tag = "会长审核年度考核", msg = "会长审核年度考核", param = true)
@SLog(tag = "协会管理系统-协会年审", msg = "会长审核年度考核")
public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) {
approvalParam.getBpmTaskApprovalTypeEnum();
Map<String, Object> variables = BeanUtil.beanToMap(approvalParam);
@@ -74,8 +74,8 @@ public class ClubExamineClubAuditController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.examine.clubAudit")
@SLog(type = "clubExamine", tag = "会长撤回年度考核", msg = "会长撤回年度考核", param = true)
public Result revoke(@Valid String taskId) {
@SLog(tag = "协会管理系统-协会年审", msg = "会长撤回年度考核")
public Result revoke(@Valid String taskId) {
bpmService.revokeTask(taskId);
return Result.success();
}
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(type = "evaluateApply", 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/ClubAuditManagerController.java
-1
View File
@@ -87,7 +87,6 @@ public class ClubAuditManagerController {
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("info.userId", "=", SecurityUtil.getUserId());
cnd.andEX("year(info.creatTime)", "=", pageForm.getYear());
cnd.and("t.taskName", "=", "ef81777f-22fb-4fe4-9800-909e6c681210");
src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubChangeManagerController.java
+2 -2
View File
@@ -127,7 +127,7 @@ public class ClubChangeManagerController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.change")
@SLog(type = "changManager", tag = "提交变更理事机构", msg = "提交变更理事机构")
@SLog(tag = "协会管理系统-信息管理", msg = "提交变更理事机构")
public Object submit(@Param("data") SysClubManager clubManager) {
ClubUser clubUser = dao.fetch(ClubUser.class, Cnd.where(ClubUser::getClubId, "=", clubManager.getClubId()).and(ClubUser::getUserId, "=", clubManager.getUserId()));
@@ -169,7 +169,7 @@ public class ClubChangeManagerController {
@ApiOperation("删除")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.change")
@SLog(type = "ruleUpdate", 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
+7 -7
View File
@@ -98,7 +98,7 @@ public class ClubInfoManageController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.manage")
@SLog(type = "infoManage", tag = "修改协会信息", msg = "修改协会信息", param = true)
@SLog(tag = "协会管理系统-信息管理", msg = "修改协会信息")
public Result doSubmit(@Param("club") SysClub club) {
clubInfoManageService.dao().update(club);
return Result.success();
@@ -107,7 +107,7 @@ public class ClubInfoManageController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.manage")
@SLog(type = "infoManage", tag = "修改缴费状态", msg = "修改缴费状态", param = true)
@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();
@@ -116,7 +116,7 @@ public class ClubInfoManageController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.manage")
@SLog(type = "infoManage", tag = "修改拨付状态", msg = "修改拨付状态", param = true)
@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();
@@ -125,7 +125,7 @@ public class ClubInfoManageController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.manage")
@SLog(type = "infoManage", tag = "退会", msg = "退会", param = true)
@SLog(tag = "协会管理系统-信息管理", msg = "退会")
public Result exitClub(@Valid String id) {
ClubUser clubUser = dao.fetch(ClubUser.class, id);
dao.delete(ClubUser.class,id);
@@ -146,7 +146,7 @@ public class ClubInfoManageController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.manage")
@SLog(type = "infoManage", tag = "删除协会成员", msg = "删除协会成员", param = true)
@SLog(tag = "协会管理系统-信息管理", msg = "删除协会成员")
public Result userDelete(@Valid String id) {
ClubUser clubUser = dao.fetch(ClubUser.class, id);
dao.delete(ClubUser.class,id);
@@ -167,7 +167,7 @@ public class ClubInfoManageController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.manage")
@SLog(type = "infoManage", tag = "修改身份", msg = "修改身份")
@SLog(tag = "协会管理系统-信息管理", msg = "修改身份")
public Result updateRoleCode(@Param("id") String id, @Valid String[] roleCodes, @Valid String clubId) {
List<String> roleCodeList = Arrays.asList(roleCodes);
//查询社团是否存在会长或者秘书长
@@ -243,7 +243,7 @@ public class ClubInfoManageController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.manage")
@SLog(type = "infoManage", tag = "添加协会成员", msg = "添加协会成员", param = true)
@SLog(tag = "协会管理系统-信息管理", msg = "添加协会成员")
public Result userDoAdd(@Valid String clubId, @Valid String[] users, @Valid String roleCode, @Valid Boolean payed) {
//查询社团是否存在会长或者秘书长
src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java
+2 -2
View File
@@ -114,7 +114,7 @@ public class ClubRefreshReportController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.refreshReport")
@SLog(type = "refreshReport", tag = "提交换届报告", msg = "提交换届报告")
@SLog(tag = "协会管理系统-信息管理", msg = "提交换届报告")
public Object submit(@Param("data") SysClubRefresh clubRefresh) {
List<SysClubRefresh> list = dao.query(SysClubRefresh.class, Cnd.NEW());
@@ -163,7 +163,7 @@ public class ClubRefreshReportController {
@ApiOperation("删除")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.refreshReport")
@SLog(type = "refreshReport", 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
+2 -2
View File
@@ -115,7 +115,7 @@ public class ClubRuleUpdateController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.ruleUpdate")
@SLog(type = "ruleUpdate", tag = "提交章程备案", msg = "提交章程备案")
@SLog(tag = "协会管理系统-信息管理", msg = "提交章程备案")
public Object submit(@Param("data")SysClubRule clubRule) {
List<SysClubRule> list = dao.query(SysClubRule.class, Cnd.NEW());
@@ -164,7 +164,7 @@ public class ClubRuleUpdateController {
@ApiOperation("删除")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.infoManage.ruleUpdate")
@SLog(type = "ruleUpdate", 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/infoManage/ClubSchoolAuditReportController.java
-1
View File
@@ -75,7 +75,6 @@ public class ClubSchoolAuditReportController {
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("info.userId", "=", SecurityUtil.getUserId());
cnd.andEX("year(info.creatTime)", "=", pageForm.getYear());
cnd.and("t.taskName", "=", "d4323546-8d09-419e-88d4-7b15862ca29d");
src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubSchoolAuditRuleController.java
-1
View File
@@ -75,7 +75,6 @@ public class ClubSchoolAuditRuleController {
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("info.userId", "=", SecurityUtil.getUserId());
cnd.andEX("year(info.creatTime)", "=", pageForm.getYear());
cnd.and("t.taskName", "=", "4a1f0656-7390-45d1-8018-ea0aff38450b");
src/main/java/com/budwk/app/zhgh/club/controller/register/ClubConfirmController.java
+2 -2
View File
@@ -47,7 +47,7 @@ public class ClubConfirmController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.register.clubConfirm")
@SLog(type = "clubConfirm", tag = "协会确认", msg = "协会确认", param = true)
@SLog(tag = "协会管理系统-协会注册", msg = "协会确认")
public Result doAudit() {
return Result.success();
}
@@ -55,7 +55,7 @@ public class ClubConfirmController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.register.clubConfirm")
@SLog(type = "clubConfirm", tag = "协会确认撤回", msg = "协会确认撤回", param = true)
@SLog(tag = "协会管理系统-协会注册", msg = "协会确认撤回")
public Result withdraw(@Valid Long processTaskId) {
return Result.success();
}
src/main/java/com/budwk/app/zhgh/club/controller/register/ClubMyApplyController.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class ClubMyApplyController {
@ApiOperation("删除协会")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.register.myApply")
@SLog(type = "clubRegister", 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
@@ -65,7 +65,7 @@ public class ClubRegistApplyController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.register.apply")
@SLog(type = "registerApply", tag = "保存注册协会", msg = "保存注册协会")
@SLog(tag = "协会管理系统-协会注册", msg = "保存注册协会")
public Result save(@Param("club") SysClub club,
@Param("::deleteIds") List<String> deleteIds,
@Param("::managePerson") List<NutMap> managePerson) {
@@ -81,7 +81,7 @@ public class ClubRegistApplyController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.register.apply")
@SLog(type = "registerApply", 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/register/ClubSchoolLeaderAuditController.java
+4 -4
View File
@@ -63,8 +63,8 @@ public class ClubSchoolLeaderAuditController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.register.schoolLeaderAudit")
@SLog(type = "schoolLeaderAudit", tag = "分管领导审核注册协会", msg = "分管领导审核注册协会", param = true)
public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) {
@SLog(tag = "协会管理系统-协会注册", msg = "分管领导审核注册协会")
public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) {
approvalParam.getBpmTaskApprovalTypeEnum();
Map<String, Object> variables = BeanUtil.beanToMap(approvalParam);
@@ -80,8 +80,8 @@ public class ClubSchoolLeaderAuditController {
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("club.register.schoolLeaderAudit")
@SLog(type = "schoolLeaderAudit", tag = "分管领导撤回注册协会", msg = "分管领导撤回注册协会", param = true)
public Result revoke(@Valid String taskId) {
@SLog(tag = "协会管理系统-协会注册", msg = "分管领导撤回注册协会")
public Result revoke(@Valid String taskId) {
bpmService.revokeTask(taskId);
return Result.success();
}