Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_jshvc

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()));
+                }
+            }
+        }
+    }
+}

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java

@@ -556,7 +556,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> 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());
 

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
                 }