diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateSchoolLeaderAuditController.java b/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateSchoolLeaderAuditController.java new file mode 100644 index 0000000..8257d79 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateSchoolLeaderAuditController.java @@ -0,0 +1,42 @@ +package com.budwk.app.zhgh.club.controller.evaluate; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.club.param.ClubUserPageForm; +import com.budwk.app.zhgh.club.service.SysClubEvaluateService; +import com.budwk.app.zhgh.club.vo.ClubEvaluatePageVo; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.validation.Valid; + +/** + * @ClassName ClubEvaluateSchoolLeaderAuditController + * @Author JyuHsin + * @Date 2025/12/9 17:11 + * @Version 1.0 + * @Description TODO + */ +@IocBean +@Ok("json") +@At("/platform/club/evaluate/schoolLeaderAudit") +public class ClubEvaluateSchoolLeaderAuditController { + + @Inject + private SysClubEvaluateService sysClubEvaluateService; + + @At("") + @Ok("beetl:/platform/zhgh/club/evaluate/schoolLeaderAudit/index.html") + @SaCheckPermission("club.evaluate.schoolLeaderAudit") + public void index() {} + + @At + @SaCheckPermission("club.evaluate.schoolLeaderAudit") + public Result pageData(@Valid ClubUserPageForm pageForm) { + Pagination pagination = sysClubEvaluateService.schoolLeaderAuditPageData(pageForm); + return Result.success(pagination); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineSchoolLeaderAuditController.java b/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineSchoolLeaderAuditController.java new file mode 100644 index 0000000..8630a96 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineSchoolLeaderAuditController.java @@ -0,0 +1,42 @@ +package com.budwk.app.zhgh.club.controller.examine; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.club.param.ClubUserPageForm; +import com.budwk.app.zhgh.club.service.SysClubExamineService; +import com.budwk.app.zhgh.club.vo.ClubExaminePageVo; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.validation.Valid; + +/** + * @ClassName ClubExamineSchoolLeaderAuditController + * @Author JyuHsin + * @Date 2025/12/9 17:01 + * @Version 1.0 + * @Description TODO + */ +@IocBean +@Ok("json") +@At("/platform/club/examine/schoolLeaderAudit") +public class ClubExamineSchoolLeaderAuditController { + + @Inject + private SysClubExamineService sysClubExamineService; + + @At("") + @Ok("beetl:/platform/zhgh/club/examine/schoolLeaderAudit/index.html") + @SaCheckPermission("club.examine.schoolLeaderAudit") + public void index() {} + + @At + @SaCheckPermission("club.examine.schoolLeaderAudit") + public Result pageData(@Valid ClubUserPageForm pageForm) { + Pagination pagination = sysClubExamineService.schoolLeaderAuditPageData(pageForm); + return Result.success(pagination); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/club/service/SysClubEvaluateService.java b/src/main/java/com/budwk/app/zhgh/club/service/SysClubEvaluateService.java index ad3424e..fddc46a 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/SysClubEvaluateService.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/SysClubEvaluateService.java @@ -19,4 +19,5 @@ public interface SysClubEvaluateService extends BaseService { Pagination minePageData(@Valid ClubUserPageForm pageForm); Pagination clubAuditPageData(@Valid ClubUserPageForm pageForm); Pagination schoolAuditPageData(@Valid ClubUserPageForm pageForm); + Pagination schoolLeaderAuditPageData(@Valid ClubUserPageForm pageForm); } 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 fb24559..e317d03 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 @@ -27,5 +27,7 @@ public interface SysClubExamineService extends BaseService schoolAuditPageData(@Valid ClubUserPageForm pageForm); + Pagination schoolLeaderAuditPageData(@Valid ClubUserPageForm pageForm); + ClubExamineVo findOne(@Valid String id); } diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubEvaluateServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubEvaluateServiceImpl.java index ca3a930..17a3db5 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubEvaluateServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubEvaluateServiceImpl.java @@ -100,6 +100,15 @@ public class SysClubEvaluateServiceImpl extends BaseServiceImpl return listPageVO(pageForm, sql, ClubEvaluatePageVo.class); } + @Override + public Pagination schoolLeaderAuditPageData(ClubUserPageForm pageForm) { + Cnd cnd = Cnd.NEW(); + cnd.and("t.taskName", "=", "ec81591d-da91-412a-90c9-df853dcef478"); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + Sql sql = generateSql(pageForm, cnd); + return listPageVO(pageForm, sql, ClubEvaluatePageVo.class); + } + private Sql generateSql(ClubUserPageForm pageForm, Cnd cnd) { Sql sql = Sqls.create(""" SELECT 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 353827d..943faa1 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 @@ -223,6 +223,15 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl schoolLeaderAuditPageData(ClubUserPageForm pageForm) { + Cnd cnd = Cnd.NEW(); + cnd.and("t.taskName", "=", "e38560b8-bcbd-49c9-959a-58318f01aea1"); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + Sql sql = generateSql(pageForm, cnd); + return listPageVO(pageForm, sql, ClubExaminePageVo.class); + } + @Override public ClubExamineVo findOne(String id) { Sql sql = Sqls.create(""" diff --git a/src/main/resources/views/platform/zhgh/club/evaluate/schoolLeaderAudit/index.html b/src/main/resources/views/platform/zhgh/club/evaluate/schoolLeaderAudit/index.html new file mode 100644 index 0000000..da21ce0 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/club/evaluate/schoolLeaderAudit/index.html @@ -0,0 +1,194 @@ + + + +
+ + + + + + + + + + + + + + + + + + 已审核 + 未审核 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/resources/views/platform/zhgh/club/examine/schoolLeaderAudit/index.html b/src/main/resources/views/platform/zhgh/club/examine/schoolLeaderAudit/index.html new file mode 100644 index 0000000..0bf78db --- /dev/null +++ b/src/main/resources/views/platform/zhgh/club/examine/schoolLeaderAudit/index.html @@ -0,0 +1,187 @@ + + + +
+ + + + + + + + + + + + + + + + + + 已审核 + 未审核 + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +