Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_jshvc

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<ClubEvaluatePageVo> pagination = sysClubEvaluateService.schoolLeaderAuditPageData(pageForm);
+		return Result.success(pagination);
+	}
+}

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<ClubExaminePageVo> pagination = sysClubExamineService.schoolLeaderAuditPageData(pageForm);
+		return Result.success(pagination);
+	}
+}

src/main/java/com/budwk/app/zhgh/club/service/SysClubEvaluateService.java

@@ -19,4 +19,5 @@ public interface SysClubEvaluateService extends BaseService<SysClubEvaluate> {
     Pagination<ClubEvaluatePageVo> minePageData(@Valid ClubUserPageForm pageForm);
     Pagination<ClubEvaluatePageVo> clubAuditPageData(@Valid ClubUserPageForm pageForm);
     Pagination<ClubEvaluatePageVo> schoolAuditPageData(@Valid ClubUserPageForm pageForm);
+    Pagination<ClubEvaluatePageVo> schoolLeaderAuditPageData(@Valid ClubUserPageForm pageForm);
 }

src/main/java/com/budwk/app/zhgh/club/service/SysClubExamineService.java

@@ -27,5 +27,7 @@ public interface SysClubExamineService extends BaseService<SysClubExamineRegiste
 
     Pagination<ClubExaminePageVo> schoolAuditPageData(@Valid ClubUserPageForm pageForm);
 
+    Pagination<ClubExaminePageVo> schoolLeaderAuditPageData(@Valid ClubUserPageForm pageForm);
+
     ClubExamineVo findOne(@Valid String id);
 }

src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubEvaluateServiceImpl.java

@@ -100,6 +100,15 @@ public class SysClubEvaluateServiceImpl extends BaseServiceImpl<SysClubEvaluate>
         return listPageVO(pageForm, sql, ClubEvaluatePageVo.class);
     }
 
+	@Override
+	public Pagination<ClubEvaluatePageVo> 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

src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java

@@ -223,6 +223,15 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
         return listPageVO(pageForm, sql, ClubExaminePageVo.class);
     }
 
+	@Override
+	public Pagination<ClubExaminePageVo> 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("""