From a359a01790372bf0379add088ca935ba20ee6586 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Thu, 20 Aug 2026 08:35:36 +0800 Subject: [PATCH] commit --- .../senior/ProposalExpeditingController.java | 3 ++- .../transact/ProposalControlController.java | 3 ++- .../democratic/proposal/senior/basic/index.html | 6 +++--- .../democratic/proposal/senior/feedback/index.html | 6 +++--- .../democratic/proposal/senior/type/index.html | 6 +++--- .../proposal/transact/control/index.html | 14 ++++++++++---- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java index c96630de..c0276759 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java @@ -101,7 +101,8 @@ public class ProposalExpeditingController { $condition """); Cnd cnd = Cnd.NEW(); - cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply")); + // 催办列表只展示现行 WF 承办答复环节中尚未完成的主办、二次答复及意见答复任务。 + cnd.and("t.taskName", "in", List.of("unit_reply", "two_unit_reply", "opinion_unit_reply")); if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalControlController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalControlController.java index 9f77a5ec..ca93d97a 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalControlController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalControlController.java @@ -47,6 +47,7 @@ public class ProposalControlController { @SaCheckPermission("proposal.control") @ApiOperation("分页列表") public Result pageData(@Valid ProposalSearchParam pageForm) { + // 状态调整属于提案业务，只保留能够关联到 proposal_info 的 WF 任务，排除其他业务流程产生的空白行。 Sql sql = Sqls.create(""" SELECT info.*, @@ -72,7 +73,7 @@ public class ProposalControlController { 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 proposal_info info ON info.id = ins.businessNo + INNER 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 diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html index 3494e878..0ab56f15 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html @@ -10,7 +10,7 @@ layout("/layouts/platform.html"){ + v-model="pageForm.searchSessionId"> @@ -277,7 +277,7 @@ layout("/layouts/platform.html"){ this.listDelegation() }, listDelegation() { - this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => { + this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.searchSessionId}).then((res) => { if (res.code === 0) { this.delegationOptions = res.data } @@ -288,7 +288,7 @@ layout("/layouts/platform.html"){ if (res.code === 0) { this.sessionOptions = res.data if (this.sessionOptions) { - this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id) + this.$set(this.pageForm, "searchSessionId", this.sessionOptions[0].id) this.listDelegation() this.pageData() } diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/feedback/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/feedback/index.html index b0f429e1..e21d2b55 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/feedback/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/feedback/index.html @@ -10,7 +10,7 @@ layout("/layouts/platform.html"){ + v-model="pageForm.searchSessionId"> @@ -207,7 +207,7 @@ layout("/layouts/platform.html"){ this.listDelegation() }, listDelegation() { - this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => { + this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.searchSessionId}).then((res) => { if (res.code === 0) { this.delegationOptions = res.data } @@ -218,7 +218,7 @@ layout("/layouts/platform.html"){ if (res.code === 0) { this.sessionOptions = res.data if (this.sessionOptions) { - this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id) + this.$set(this.pageForm, "searchSessionId", this.sessionOptions[0].id) this.listDelegation() this.pageData() } diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html index 9dc757f2..f0b24782 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html @@ -9,7 +9,7 @@ layout("/layouts/platform.html"){ - + @@ -181,7 +181,7 @@ layout("/layouts/platform.html"){ this.listDelegation() }, listDelegation() { - this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => { + this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.searchSessionId }).then((res) => { if (res.code === 0) { this.delegationOptions = res.data } @@ -192,7 +192,7 @@ layout("/layouts/platform.html"){ if (res.code === 0) { this.sessionOptions = res.data if (this.sessionOptions) { - this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id) + this.$set(this.pageForm, "searchSessionId", this.sessionOptions[0].id) this.listDelegation() this.pageData() } diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/control/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/control/index.html index 4868b471..bda3ffa6 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/control/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/control/index.html @@ -6,7 +6,7 @@ layout("/layouts/platform.html"){ - + @@ -85,6 +85,7 @@ layout("/layouts/platform.html"){ el: "#app", store, mixins: [initTableMixins], + components: { "proposal-info": PROPOSAL_INFO }, @@ -111,11 +112,12 @@ layout("/layouts/platform.html"){ jumpForm: { targetTaskName: "", tf_audit: true - } + }, + sessionOptions:[], } }, created() { - this.pageData() + // 默认届次确定后再加载表格，避免无届次请求覆盖已按届次筛选的结果。 this.listOpenSession() }, methods: { @@ -173,10 +175,14 @@ layout("/layouts/platform.html"){ listOpenSession() { this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => { if (res.code === 0) { - this.sessionOptions = res.data + this.sessionOptions = res.data || [] if (this.sessionOptions && this.sessionOptions.length) { this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id) this.pageData() + } else { + // 没有开启的教代会时保持空列表，避免发起无届次的全量流程查询。 + this.tableData = [] + this.$set(this.pageForm, "totalCount", 0) } } })