From f2224cd53e4d9d82f8a9845fb29a393d5c06e8be Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Tue, 9 Dec 2025 18:15:00 +0800 Subject: [PATCH] commit --- .../ActivityBudgetSchoolAuditController.java | 4 +- ...tivityBudgetSchoolPrincipalController.java | 124 +++++++++ .../activityBudget/schoolPrincipal/index.html | 235 ++++++++++++++++++ 3 files changed, 361 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolPrincipalController.java create mode 100644 src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java index 1f564d5..b80dac6 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java @@ -32,7 +32,7 @@ import java.util.List; @IocBean @Ok("json:full") @Slf4j -@Api(tags = "校工会审核年度预算申报") +@Api(tags = "校工会审核-年度预算申报") @At("/platform/activity/budget/schoolAudit") public class ActivityBudgetSchoolAuditController { @@ -89,7 +89,7 @@ public class ActivityBudgetSchoolAuditController { """); Cnd cnd = Cnd.NEW(); cnd.and("t.taskName", "=", "b6f29037-972d-4b97-8677-c3b3672ef0dc"); -// cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.andEX("info.unionId", "=", unionId); cnd.andEX("info.outlayManageSource", "=", outlayManageSource); cnd.andEX("info.budgetReimburseType", "=", budgetReimburseType); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolPrincipalController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolPrincipalController.java new file mode 100644 index 0000000..f5471aa --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolPrincipalController.java @@ -0,0 +1,124 @@ +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.conteoller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import java.util.List; + +/** + * @author zhf + * @date 2025/12/9 17:12 + * @description 校工会预审核 + */ +@IocBean +@Ok("json:full") +@Slf4j +@Api(tags = "校工会预审核-年度预算申报") +@At("/platform/activity/budget/schoolPrincipal") +public class ActivityBudgetSchoolPrincipalController { + + @Inject + private ActivityBudgetService activityBudgetService; + + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html") + @SaCheckPermission("activity.budget.schoolPrincipal") + public void index() { + } + + + @At + @ApiOperation("分页查询") + @SaCheckPermission("activity.budget.schoolPrincipal") + public Result pageData(PageForm pageForm, + Integer year, + String unionId, + String clubId, + String budgetReimburseType, + Boolean approval, + String outlayManageSource, + String activityMatter) { + Sql sql = Sqls.create(""" + SELECT + info.*, + YEAR(info.applyDate) year, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + ins.processDefineId instanceProcessDefineId, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable, + IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, + IF(rt.id IS NOT NULL, 1, 0) AS canRevoke + FROM + wf_process_task t + LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN activity_budget info ON info.id = ins.businessNo + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 + LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.and("t.taskName", "=", "0b6aea8c-9d24-4d6d-b10b-4c930c919093"); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + cnd.andEX("info.unionId", "=", unionId); + cnd.andEX("info.outlayManageSource", "=", outlayManageSource); + cnd.andEX("info.budgetReimburseType", "=", budgetReimburseType); + + if (approval) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } + + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup group = new SqlExpressionGroup(); + group.orLike("info.loginName", pageForm.getSearchKeyword()); + group.orLike("info.userName", pageForm.getSearchKeyword()); + cnd.and(group); + } + + + cnd.andEX("YEAR(info.applyDate)", "=", year); + cnd.and(Cnd.likeEX("info.activityMatter", activityMatter)); + cnd.groupBy("t.id"); + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.desc("t.createdAt").desc("info.applyDate"); + } else { + cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + + sql.setCondition(cnd); + Pagination pageVO = activityBudgetService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pageVO); + } +} diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html new file mode 100644 index 0000000..530176e --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html @@ -0,0 +1,235 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{item.name}} + + + + + 已审核 + 未审核 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +