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("""

src/main/resources/views/platform/zhgh/club/evaluate/schoolLeaderAudit/index.html

@@ -0,0 +1,194 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<style></style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                            placeholder="请选择年度"
+                            type="year"
+                            style="width: 100%"
+                            v-model="pageForm.year"
+                            value-format="yyyy"
+                    ></el-date-picker>
+                </search-item>
+                <search-item label="协会名称">
+                    <el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
+                        <el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+
+        <el-card class="mt10" shadow="never">
+            <table-tool label="申请列表">
+                <el-radio-group v-model="pageForm.audit" @change="doSearch" size="small">
+                    <el-radio-button :label="true">已审核</el-radio-button>
+                    <el-radio-button :label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+            <el-table :data="tableData">
+                <el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
+                <el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
+                <el-table-column label="协会编码" prop="clubCode" sortable show-overflow-tooltip></el-table-column>
+                <el-table-column label="协会类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
+                <el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
+                    <template slot-scope="{row}">
+                        <span>{{ row.foundTime ? $moment(row.foundTime).format('YYYY-MM-DD') : '无' }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="年度" prop="applyYear" sortable show-overflow-tooltip>
+                    <template slot-scope="{row}">
+                        <span>{{ $moment(row.applyTime).format('YYYY') }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="申请时间" prop="applyTime" sortable show-overflow-tooltip></el-table-column>
+                <el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
+                    <template v-slot="{ row }">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="300">
+                    <template slot-scope="{row}">
+                        <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="onAudit(row)" size="mini" type="primary">审核</el-button>
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <evaluate-info ref="evaluateInfoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                             class="flow-task-form">
+                        <el-form-item label="审批意见" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
+                        <el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
+                    </el-row>
+                </div>
+            </evaluate-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../common/evaluateInfo.js"){}#-->
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        dicts: ["PROCESS_INSTANCE_STATE"],
+        data() {
+            return {
+                pageForm: {
+                    clubId: "",
+                    year: this.$moment().format("YYYY"),
+                    audit: false
+                },
+                viewData: {},
+                clubList: [],
+                showApprovalForm: false
+            }
+        },
+        components: {
+            "evaluate-info": EVALUATE_INFO_COMPONENT
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.evaluateInfoRef.onOpen(row)
+                    this.showApprovalForm = false
+                })
+            },
+            onAudit(row) {
+                this.$refs.guava.public(() => {
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.showApprovalForm = true
+                    this.$refs.evaluateInfoRef.onOpen(row)
+                })
+            },
+            handleTaskAction(val) {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/executeTask", {
+                        data: JSON.stringify({
+                            ...this.formData,
+                            submitType: val
+                        })
+                    }).then((res) => {
+                        if (res.code === 0) {
+                            this.$refs.guava.index()
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            async pageData() {
+                let form = clone(this.pageForm)
+                if (form.isAudit === null) {
+                    delete form.isAudit
+                }
+                const resp = await this.$axios.post("/platform/club/evaluate/schoolLeaderAudit/pageData", form)
+                if (resp.code === 0) {
+                    this.tableData = resp.data.list
+                    this.pageForm.totalCount = resp.data.totalCount
+                } else {
+                    this.$message.warning(resp.msg)
+                }
+            },
+            //获取当前登录用户管理的协会并且年度审核通过的
+            async getMyClubAndYearAuditPass() {
+                const resp = await this.$axios.post("/platform/club/evaluate/apply/getMyClubAndYearAuditPass", {
+                    year: this.pageForm.year
+                })
+                this.clubList = resp.data
+            }
+        },
+        async created() {
+            await this.getMyClubAndYearAuditPass()
+            await this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/club/examine/schoolLeaderAudit/index.html

@@ -0,0 +1,187 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<style>
+
+</style>
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                            placeholder="请选择年度"
+                            type="year"
+                            style="width: 100%"
+                            v-model="pageForm.year"
+                            value-format="yyyy"
+                            @change="doSearch"
+                    ></el-date-picker>
+                </search-item>
+                <search-item label="协会名称">
+                    <el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
+                        <el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+
+        <el-card class="mt10" shadow="never">
+            <table-tool label="申请列表">
+                <el-radio-group v-model="pageForm.audit" @change="doSearch" size="small">
+                    <el-radio-button :label="true">已审核</el-radio-button>
+                    <el-radio-button :label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+            <el-table :data="tableData">
+                <el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
+                <el-table-column label="年度" prop="year" sortable show-overflow-tooltip></el-table-column>
+                <el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
+                <el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
+                    <template slot-scope="{row}">
+                        <span>{{ $moment(row.foundTime).format('YYYY-MM-DD') }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="申请时间" prop="registerDate" sortable show-overflow-tooltip></el-table-column>
+                <el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
+                    <template v-slot="{ row }">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="300">
+                    <template v-slot="{row}">
+                        <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="onAudit(row)" size="mini" type="primary">审核</el-button>
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <examine-info ref="examineInfoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                             class="flow-task-form">
+                        <el-form-item label="审批意见" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
+                        <el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
+                    </el-row>
+                </div>
+            </examine-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../common/examineInfo.js"){}#-->
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                pageForm: {
+                    clubId: "",
+                    year: this.$moment().format("YYYY"),
+                    audit: false
+                },
+                viewData: {},
+                clubList: [],
+                showApprovalForm: false
+            }
+        },
+        components: {
+            "examine-info": EXAMINE_INFO_COMPONENT
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.examineInfoRef.onOpen(row)
+                    this.showApprovalForm = false
+                })
+            },
+            onAudit(row) {
+                this.$refs.guava.public(() => {
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.showApprovalForm = true
+                    this.$refs.examineInfoRef.onOpen(row)
+                })
+            },
+            handleTaskAction(val) {
+                this.$confirm("您确定要提交吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/executeTask", {
+                        data: JSON.stringify({
+                            ...this.formData,
+                            submitType: val
+                        })
+                    }).then((res) => {
+                        if (res.code === 0) {
+                            this.$refs.guava.index()
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            async pageData() {
+                let form = clone(this.pageForm)
+                if (form.isAudit === null) {
+                    delete form.isAudit
+                }
+                const resp = await this.$axios.post("/platform/club/examine/schoolLeaderAudit/pageData", form)
+                if (resp.code === 0) {
+                    this.tableData = resp.data.list
+                    this.pageForm.totalCount = resp.data.totalCount
+                } else {
+                    this.$message.warning(resp.msg)
+                }
+            },
+            async getMyClub() {
+                const resp = await this.$axios.post("/platform/club/examine/apply/getClubsByRole")
+                this.clubList = resp.data
+            }
+        },
+        async created() {
+            await this.getMyClub()
+            await this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->