From 45345d1fb70cb589f334f16eacc22e065d787950 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 7 Feb 2024 11:10:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=A8=BD=E6=9F=A5=E5=BB=B6=E6=9C=9F?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B):=2081838?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activiti/mapper/ProcessAllMapper.java    |  2 ++
 .../modules/activiti/mapper/xml/ProcessAllMapper.xml |  5 +++++
 .../esdeclare/service/impl/EsDeclareFlow.java        | 10 +++-------
 .../esinspect/service/impl/EsInspectFlow.java        | 10 +++-------
 .../service/impl/EsInspectDelayApplyFlow.java        | 10 +++-------
 .../service/impl/EsInspectPlanFlow.java              | 10 +++-------
 .../service/impl/EsInspectRectifyFlow.java           | 12 +++---------
 .../service/impl/EsPermissionApplyFlow.java          | 10 +++-------
 .../impl/ProcessFbEntryChangeServiceImpl.java        |  6 ++----
 .../service/impl/MeetingManageFlow.java              | 12 +++++-------
 .../modules/activiti/service/ProcessAllService.java  |  5 +++++
 11 files changed, 37 insertions(+), 55 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessAllMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessAllMapper.java
index 97c3a57d..c959a872 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessAllMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessAllMapper.java
@@ -21,4 +21,6 @@ public interface ProcessAllMapper extends BaseMapper<ProcessAll> {
     IPage<ProcessAll> getSentList(Page<ProcessAll> page, @Param(Constants.WRAPPER) QueryWrapper<ProcessAll> queryWrapper, @Param("column") String column, @Param("order") String order);
 
     IPage<ProcessAll> getAllList(Page<ProcessAll> page, @Param(Constants.WRAPPER) QueryWrapper<ProcessAll> queryWrapper, @Param("column") String column, @Param("order") String order);
+
+    int physicalDeleteByProjectId(@Param("tableName") String tableName, @Param("projectId") String projectId);
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml
index 712e1ac9..dd6ff4be 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml
@@ -19,6 +19,11 @@
             </if>
         </if>
     </sql>
+
+    <delete id="physicalDeleteByProjectId">
+        delete from ${tableName} where project_id = #{projectId}
+    </delete>
+
     <select id="getTodoList" resultType="com.jero.modules.activiti.entity.ProcessAll">
         select par.create_time as received_task_time,
                par.task_id,
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java
index f6acd12f..0e2029a8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java
@@ -1,10 +1,8 @@
 package com.jero.modules.activiti.process.esdeclare.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
-import com.jero.modules.activiti.process.esdeclare.entity.ProcessEsDeclare;
-import com.jero.modules.activiti.process.esdeclare.service.IProcessEsDeclareService;
+import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.WorkCenterService;
 import com.jero.modules.activiti.util.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -28,11 +26,9 @@ public class EsDeclareFlow implements WorkCenterService {
      */
     @Override
     public void changeToDraft(ProcessAll processAll) {
-        IProcessEsDeclareService processEsDeclareService = SpringContextUtil.getBean(IProcessEsDeclareService.class);
         // 删除业务表数据
-        processEsDeclareService.remove(
-                new LambdaQueryWrapper<ProcessEsDeclare>()
-                        .eq(ProcessEsDeclare::getProjectId, processAll.getProjectId()));
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.physicalDeleteByProjectId("process_es_declare", processAll.getProjectId());
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java
index 3b6ecd42..311369f6 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java
@@ -1,10 +1,8 @@
 package com.jero.modules.activiti.process.esinspect.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
-import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect;
-import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService;
+import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.WorkCenterService;
 import com.jero.modules.activiti.util.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -28,11 +26,9 @@ public class EsInspectFlow implements WorkCenterService {
      */
     @Override
     public void changeToDraft(ProcessAll processAll) {
-        IProcessEsInspectService processEsInspectService = SpringContextUtil.getBean(IProcessEsInspectService.class);
         // 删除业务表数据
-        processEsInspectService.remove(
-                new LambdaQueryWrapper<ProcessEsInspect>()
-                        .eq(ProcessEsInspect::getProjectId, processAll.getProjectId()));
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.physicalDeleteByProjectId("process_es_inspect", processAll.getProjectId());
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java
index 9e3aff5f..2ef1a2bb 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java
@@ -1,10 +1,8 @@
 package com.jero.modules.activiti.process.esinspectdelayapply.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
-import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply;
-import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService;
+import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.WorkCenterService;
 import com.jero.modules.activiti.util.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -28,11 +26,9 @@ public class EsInspectDelayApplyFlow implements WorkCenterService {
      */
     @Override
     public void changeToDraft(ProcessAll processAll) {
-        IProcessEsInspectDelayApplyService processEsInspectDelayApplyService = SpringContextUtil.getBean(IProcessEsInspectDelayApplyService.class);
         // 删除业务表数据
-        processEsInspectDelayApplyService.remove(
-                new LambdaQueryWrapper<ProcessEsInspectDelayApply>()
-                        .eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId()));
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.physicalDeleteByProjectId("process_es_inspect_delay_apply", processAll.getProjectId());
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java
index 82b240a3..e4d9dd82 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java
@@ -1,10 +1,8 @@
 package com.jero.modules.activiti.process.esinspectplan.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
-import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan;
-import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanService;
+import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.WorkCenterService;
 import com.jero.modules.activiti.util.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -28,11 +26,9 @@ public class EsInspectPlanFlow implements WorkCenterService {
      */
     @Override
     public void changeToDraft(ProcessAll processAll) {
-        IProcessEsInspectPlanService processEsInspectPlanService = SpringContextUtil.getBean(IProcessEsInspectPlanService.class);
         // 删除业务表数据
-        processEsInspectPlanService.remove(
-                new LambdaQueryWrapper<ProcessEsInspectPlan>()
-                        .eq(ProcessEsInspectPlan::getProjectId, processAll.getProjectId()));
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.physicalDeleteByProjectId("process_es_inspect_plan", processAll.getProjectId());
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java
index 199a27bf..99ce08ce 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java
@@ -1,10 +1,8 @@
 package com.jero.modules.activiti.process.esinspectrectify.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
-import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify;
-import com.jero.modules.activiti.process.esinspectrectify.service.IProcessEsInspectRectifyService;
+import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.WorkCenterService;
 import com.jero.modules.activiti.util.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -29,12 +27,8 @@ public class EsInspectRectifyFlow implements WorkCenterService {
     @Override
     public void changeToDraft(ProcessAll processAll) {
         // 删除业务表数据
-        IProcessEsInspectRectifyService processEsInspectRectifyService =
-                SpringContextUtil.getBean(IProcessEsInspectRectifyService.class);
-        processEsInspectRectifyService.remove(
-                new LambdaQueryWrapper<ProcessEsInspectRectify>()
-                        .eq(ProcessEsInspectRectify::getProjectId, processAll.getProjectId()));
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.physicalDeleteByProjectId("process_es_inspect_rectify", processAll.getProjectId());
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java
index b170b783..d4473cec 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java
@@ -1,10 +1,8 @@
 package com.jero.modules.activiti.process.espermissionapply.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
-import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply;
-import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService;
+import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.WorkCenterService;
 import com.jero.modules.activiti.util.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -28,11 +26,9 @@ public class EsPermissionApplyFlow implements WorkCenterService {
      */
     @Override
     public void changeToDraft(ProcessAll processAll) {
-        IProcessEsPermissionApplyService processEsPermissionApplyService = SpringContextUtil.getBean(IProcessEsPermissionApplyService.class);
         // 删除业务表数据
-        processEsPermissionApplyService.remove(
-                new LambdaQueryWrapper<ProcessEsPermissionApply>()
-                        .eq(ProcessEsPermissionApply::getProjectId, processAll.getProjectId()));
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.physicalDeleteByProjectId("process_es_permission_apply", processAll.getProjectId());
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
index 233d6fd8..6822652a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
@@ -635,10 +635,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
     @Override
     public void changeToDraft(ProcessAll processAll) {
         // 删除业务表数据
-        IProcessFbEntryChangeService processFbEntryChangeService = SpringContextUtil.getBean(IProcessFbEntryChangeService.class);
-        processFbEntryChangeService.remove(
-                new LambdaQueryWrapper<ProcessFbEntryChange>()
-                .eq(ProcessFbEntryChange::getId, processAll.getProjectId()));
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.physicalDeleteByProjectId("process_fb_entry_change", processAll.getProjectId());
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java
index 408bf938..348890e5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java
@@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingMana
 import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel;
 import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManagePersonnelService;
 import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManageService;
+import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.WorkCenterService;
 import com.jero.modules.activiti.util.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -33,17 +34,14 @@ public class MeetingManageFlow implements WorkCenterService {
      */
     @Override
     public void changeToDraft(ProcessAll processAll) {
+        // 删除业务表数据
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.physicalDeleteByProjectId("process_meeting_manage", processAll.getProjectId());
+        // 删除业务关联表数据
         IProcessMeetingManageService processMeetingManageService = SpringContextUtil.getBean(IProcessMeetingManageService.class);
         List<ProcessMeetingManage> list = processMeetingManageService.list(new LambdaQueryWrapper<ProcessMeetingManage>()
                 .eq(ProcessMeetingManage::getProjectId, processAll.getProjectId()));
-        // 删除业务表数据
-        processMeetingManageService.remove(
-                new LambdaQueryWrapper<ProcessMeetingManage>()
-                        .eq(ProcessMeetingManage::getProjectId, processAll.getProjectId()));
-
         IProcessMeetingManagePersonnelService processMeetingManagePersonnelService = SpringContextUtil.getBean(IProcessMeetingManagePersonnelService.class);
-
-        // 删除业务表数据
         List<String> idList = list.stream().map(ProcessMeetingManage::getId).collect(Collectors.toList());
         processMeetingManagePersonnelService.remove(
                 new LambdaQueryWrapper<ProcessMeetingManagePersonnel>()
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
index 1db57797..16f48b1f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
@@ -382,4 +382,9 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
             }
         }
     }
+
+    public void physicalDeleteByProjectId(String tableName, String projectId){
+        // 物理删除
+        processAllMapper.physicalDeleteByProjectId(tableName, projectId);
+    }
 }