From b306765c8f0da5b89ec6171fb2cef6e8e86f5e96 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Sat, 20 Dec 2025 09:53:28 +0800 Subject: [PATCH] commit --- .../transact/ProposalSecondedController.java | 2 + .../ProposalUnitManagerController.java | 119 ++++++++++ .../zhgh/democratic/proposal/common/info.js | 2 +- .../proposal/transact/seconded/index.html | 14 +- .../proposal/transact/unitManager/index.html | 210 ++++++++++++++++++ 5 files changed, 343 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnitManagerController.java create mode 100644 src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitManager/index.html diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java index 0d6c726..fdcffad 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java @@ -65,6 +65,7 @@ public class ProposalSecondedController { public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) { Sql sql = Sqls.create(""" SELECT + us.unionName, info.*, type.name AS typeName, tcs.fullName AS sessionName, @@ -93,6 +94,7 @@ public class ProposalSecondedController { 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 LEFT JOIN proposal_info info ON info.id = ins.businessNo + LEFT JOIN vw_user us ON us.id = info.createUserId LEFT JOIN proposal_type type on type.id = info.typeId LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnitManagerController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnitManagerController.java new file mode 100644 index 0000000..5b06c9d --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnitManagerController.java @@ -0,0 +1,119 @@ +package com.budwk.app.zhgh.democratic.proposal.controller.transact; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.bpm.service.BpmService; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam; +import com.budwk.app.zhgh.democratic.proposal.service.ProposalDelegationService; +import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService; +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.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; +import java.util.List; + +/** + * 团长审核 + */ +@IocBean +@At("/platform/proposal/unitManager") +@Slf4j +@Ok("json:full") +@Api(tags = "提案-办理-单位负责人审核") +public class ProposalUnitManagerController { + + @Inject + private BaseService baseService; + @Inject + private ProposalCommonService proposalCommonService; + @Inject + private ProposalDelegationService proposalDelegationService; + @Inject + private BpmService bpmService; + + @At("") + @Ok("beetl:/platform/zhgh/democratic/proposal/transact/unitManager/index.html") + @SaCheckPermission("proposal.unitManager") + public void index() { + } + + @At("/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/unitManager/index.html") + @SaCheckPermission("proposal.unitManager") + public void h5Index() { + } + + + @At + @SaCheckPermission("proposal.unitManager") + @ApiOperation("分页列表") + public Result pageData(@Valid ProposalSearchParam pageForm,boolean approval) { + Sql sql = Sqls.create(""" + SELECT + info.*, + type.name AS typeName, + tcs.fullName AS sessionName, + tcd.`name` AS delegationName, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariable, + 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 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 + LEFT JOIN proposal_info info ON info.id = ins.businessNo + LEFT JOIN proposal_type type on type.id = info.typeId + LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId + LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.and("t.taskName", "=", "unitManager"); + + if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){ + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + } + + if (approval) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } + ProposalSearchParam.buildSearch(cnd, pageForm); + cnd.groupBy("t.id"); + cnd.desc("t.createdAt"); + sql.setCondition(cnd); + Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(),pageForm.getPageSize(), sql); + return Result.success(pagination); + } + +} diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js index 282754b..4db32ca 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js @@ -29,7 +29,7 @@ const PROPOSAL_INFO = { :value="viewData.caseFilingResult"> -
{{viewData.researchFindings}}
+
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html index bb4a6df..26b3ad3 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html @@ -28,7 +28,8 @@ layout("/layouts/platform.html"){ - + 查看 附议 - - + + @@ -126,11 +127,18 @@ layout("/layouts/platform.html"){ }) }, openAudit(row) { + let type = "" + if (["机关党群", "机关行政"].includes(row.unionName)) { + type = "JG" + } else { + type = "XY" + } this.$refs.guava.edit(() => { this.showApprovalForm = true this.formData = { processTaskId: row.taskId, taskName: row.curTaskName, + type: type, tf_opinion: "同意该提案" } this.$refs.proposalInfoRef.onOpen(row) diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitManager/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitManager/index.html new file mode 100644 index 0000000..3416c3d --- /dev/null +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitManager/index.html @@ -0,0 +1,210 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + 已审核 + 未审核 + + + + + + + + + + + + + + + + + + +
+ + + +