From 0a5c890fc2854d021e381a8fb6eab8f24ef9dc51 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Wed, 28 Jan 2026 09:35:57 +0800 Subject: [PATCH] commit --- .../controller/transact/ProposalCommitteeFilingController.java | 3 ++- .../democratic/proposal/transact/committeeFiling/index.html | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java index c411adc..544084b 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java @@ -80,7 +80,8 @@ public class ProposalCommitteeFilingController { t.taskParentId, t.variable taskVariable, IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, - IF(rt.id IS NOT NULL OR (ins.state = 20 AND info.caseFilingResult = 'NOT'), 1, 0) AS canRevoke + IF(rt.id IS NOT NULL OR (ins.state = 20 AND info.caseFilingResult = 'NOT'), 1, 0) AS canRevoke, + (select count(DISTINCT seconderId) from proposal_second where proposalId = info.id and isAgree = true) as agreeCount FROM wf_process_task t LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html index ac26cbf..45439a9 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html @@ -188,6 +188,7 @@ layout("/layouts/platform.html"){ { label: "提案名称", prop: "name", width: "200px" }, { label: "提案类别", prop: "typeName" }, { label: "届次", prop: "sessionName" }, + { label: "附议同意数", prop: "agreeCount" }, { label: "立案结果", prop: "caseFilingResult" }, { label: "代表团", prop: "delegationName" }, { label: "当前节点", prop: "curTaskName" },