From 8c02b77d2336f3d52c9e7a0c09c1968440259362 Mon Sep 17 00:00:00 2001 From: Paidax Date: Mon, 22 Dec 2025 18:00:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?pref=5F#jshvc=E6=8F=90=E6=A1=88=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...salCommitteeFilingRevokeEventListener.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 src/main/java/com/budwk/app/zhgh/democratic/proposal/listenter/ProposalCommitteeFilingRevokeEventListener.java 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 new file mode 100644 index 0000000..e659426 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/listenter/ProposalCommitteeFilingRevokeEventListener.java @@ -0,0 +1,49 @@ +package com.budwk.app.zhgh.democratic.proposal.listenter; + +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.budwk.app.flow.engine.event.ProcessEvent; +import com.budwk.app.flow.engine.event.ProcessEventListener; +import com.budwk.app.flow.entity.ProcessInstance; +import com.budwk.app.flow.entity.ProcessTask; +import com.budwk.app.flow.enums.ProcessEventTypeEnum; +import com.budwk.app.flow.service.ProcessInstanceService; +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.lang.Lang; + +/** + * @version 1.0 + * @Author FKY + * @name：ProposalCommitteeFilingRevokeEventListener + * @Date 2025/12/22 17:43 + * @注释 提案立案审核撤回监听器 + */ +public class ProposalCommitteeFilingRevokeEventListener implements ProcessEventListener { + + @Inject + private Dao dao; + @Inject + private ProcessInstanceService processInstanceService; + + @Override + public void onEvent(ProcessEvent event) { + if (event.getEventType() == ProcessEventTypeEnum.PROCESS_TASK_REVOKE) { + Long taskId = event.getSourceId(); + ProcessTask task = dao.fetch(ProcessTask.class, taskId); + ProcessInstance processInstance = processInstanceService.getById(task.getProcessInstanceId()); + + // 处理并案信息撤回 + if ("committee".equals(task.getTaskName())) { + // 如果有并案，删掉并案数据（傻逼提的需求） + 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())); + } + } + } + } +} From 517a61c1e7fb53cefcaefb99257da75208a11980 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Mon, 22 Dec 2025 18:00:36 +0800 Subject: [PATCH 2/2] commit --- .../proposal/service/common/ProposalCommonServiceImpl.java | 2 +- .../resources/static/assets/platform/js/util/commonUtil.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java index 586fab3..cf77bd9 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java @@ -556,7 +556,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp if (ObjectUtil.isNotEmpty(nextSession)) { docData.put("newSessionYear", nextSession.getStartDate().getYear()); docData.put("newSessionMonth", nextSession.getStartDate().getMonth()); - docData.put("newSessionDay", nextSession.getStartDate().getMonth()); + docData.put("newSessionDay", nextSession.getStartDate().getDay()); docData.put("newSessionName", nextSession.getFullName()); docData.put("currentMonth", DateUtil.thisMonth()); diff --git a/src/main/resources/static/assets/platform/js/util/commonUtil.js b/src/main/resources/static/assets/platform/js/util/commonUtil.js index c598b4f..02b9bf4 100644 --- a/src/main/resources/static/assets/platform/js/util/commonUtil.js +++ b/src/main/resources/static/assets/platform/js/util/commonUtil.js @@ -74,11 +74,11 @@ const commonUtil = { const content = reader.result // 将字符串解析为 JSON 对象 const jsonObject = JSON.parse(content) - this.$message.error(jsonObject.msg) + ELEMENT.Message.error(jsonObject.msg) } reader.readAsText(response.data) } catch (err) { - this.$message.error("下载文件出错") + ELEMENT.Message.error("下载文件出错") } return }