commit

2025-12-26 11:23:00 +08:00
parent 8ac6baf211
commit 3f6b9dabbc
3 changed files with 27 additions and 3 deletions
@@ -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()));
                }
            }
        }
@@ -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({
@@ -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) {