From 3f6b9dabbc259b3e41cf2cea963acb06b3e9cc1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=A3=E4=BA=9B=E8=8A=B1=E5=84=BF?= <1156921458@qq.com>
Date: Fri, 26 Dec 2025 11:23:00 +0800
Subject: [PATCH] commit

---
 ...oposalCommitteeFilingRevokeEventListener.java |  6 ++++--
 .../proposal/transact/committeeFiling/index.html |  8 +++++++-
 .../proposal/transact/committeeFiling/merge.js   | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/listenter/ProposalCommitteeFilingRevokeEventListener.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/listenter/ProposalCommitteeFilingRevokeEventListener.java
index e659426..39ddf56 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/listenter/ProposalCommitteeFilingRevokeEventListener.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/listenter/ProposalCommitteeFilingRevokeEventListener.java
@@ -12,6 +12,7 @@ import com.budwk.app.zhgh.democratic.proposal.models.ProposalMerge;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.Lang;
 
 /**
@@ -21,6 +22,7 @@ import org.nutz.lang.Lang;
  * @Date 2025/12/22 17:43
  * @注释  提案立案审核撤回监听器
  */
+@IocBean
 public class ProposalCommitteeFilingRevokeEventListener implements ProcessEventListener {
 
     @Inject
@@ -37,11 +39,11 @@ public class ProposalCommitteeFilingRevokeEventListener implements ProcessEventL
 
             // 处理并案信息撤回
             if ("committee".equals(task.getTaskName())) {
-                // 如果有并案，删掉并案数据（傻逼提的需求）
+                // 如果有并案，删掉并案数据（傻逼提的需求,nmsl）
                 ProposalMerge proposalMerge = dao.fetch(ProposalMerge.class, Cnd.where("proposalId", "=", processInstance.getBusinessNo()));
 
                 if (Lang.isNotEmpty(proposalMerge)) {
-                    dao.clear(ProposalMerge.class, Cnd.where(ProposalMerge::getGroupId, "=", proposalMerge.getGroupId()));
+                    dao.clear(ProposalMerge.class, Cnd.where(ProposalMerge::getProposalId, "=", proposalMerge.getProposalId()));
                 }
             }
         }
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 defcf72..3d90464 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
@@ -199,6 +199,12 @@ layout("/layouts/platform.html"){
                     tf_masterUnitId: null,
                     tf_slaveUnitIds: []
                 },
+                formRules: {
+                    tf_caseFilingResult: [{ required: true, message: "请选择立案结果", trigger: ["blur", "change"] }],
+                    tf_caseFilingType: [{ required: true, message: "请选择立案类型", trigger: ["blur", "change"] }],
+                    tf_masterUnitId: [{ required: true, message: "请选择主办单位", trigger: "blur" }],
+                    approvalOpinion: [{ required: true, message: "请填写审核意见", trigger: "blur" }],
+                },
                 showApprovalForm: false,
                 sessionOptions: [],
                 delegationOptions: [],
@@ -238,7 +244,7 @@ layout("/layouts/platform.html"){
 					} else {
 	                    tf_helpunitreply = 'NO_HELP_UNIT'
                     }
-					
+
                     const loading = createLoading('提交中')
                     this.$axios.post("/flow/common/executeTask", {
                         data: JSON.stringify({
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js
index d7bd213..a574a9c 100644
--- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js
@@ -92,6 +92,12 @@ const merge = {
                 tf_masterUnitId: null,
                 tf_slaveUnitIds: []
             },
+            formRules: {
+                tf_caseFilingResult: [{ required: true, message: "请选择立案结果", trigger: ["blur", "change"] }],
+                tf_caseFilingType: [{ required: true, message: "请选择立案类型", trigger: ["blur", "change"] }],
+                tf_masterUnitId: [{ required: true, message: "请选择主办单位", trigger: "blur" }],
+                approvalOpinion: [{ required: true, message: "请填写审核意见", trigger: "blur" }],
+            },
             underTakeOptions: []
         }
     },
@@ -123,6 +129,15 @@ const merge = {
                 cancelButtonText: "取消",
                 type: "warning"
             }).then(() => {
+                debugger
+                // 是否有协办单位
+                let tf_helpunitreply;
+                if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) {
+                    tf_helpunitreply = 'HAS_HELP_UNIT'
+                } else {
+                    tf_helpunitreply = 'NO_HELP_UNIT'
+                }
+
                 const loading = createLoading('提交中')
                 this.$axios.post("/platform/proposal/committeeFiling/merge", {
                     data: JSON.stringify({
@@ -132,6 +147,7 @@ const merge = {
                         tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
                         tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
                         tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
+                        tf_helpunitreply: tf_helpunitreply
                     })
                 }).then((res) => {
                     if (res.code === 0) {