From 11b57fb7a13f3af898496e8f31ad540c80354afa Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 29 Mar 2024 09:26:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93/=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/activiti/mapper/ProcessAllMapper.java   | 2 ++
 .../jero/modules/activiti/mapper/xml/ProcessAllMapper.xml    | 4 ++++
 .../fb/service/impl/ProcessFbEntryChangeServiceImpl.java     | 2 +-
 .../com/jero/modules/activiti/service/ProcessAllService.java | 5 +++++
 4 files changed, 12 insertions(+), 1 deletion(-)

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 c959a872..924c86cd 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
@@ -23,4 +23,6 @@ public interface ProcessAllMapper extends BaseMapper<ProcessAll> {
     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);
+
+    int physicalDeleteById(@Param("tableName") String tableName, @Param("id") String id);
 }
\ 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 dd6ff4be..b86df78f 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
@@ -24,6 +24,10 @@
         delete from ${tableName} where project_id = #{projectId}
     </delete>
 
+    <delete id="physicalDeleteById">
+        delete from ${tableName} where id = #{id}
+    </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/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
index 2ee008b5..a20551cb 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
@@ -653,7 +653,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
     public void changeToDraft(ProcessAll processAll) {
         // 删除业务表数据
         ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
-        processAllService.physicalDeleteByProjectId("process_fb_entry_change", processAll.getProjectId());
+        processAllService.physicalDeleteById("process_fb_entry_change", processAll.getProjectId());
     }
 
     @Override
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 8515d00c..6556ae7f 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
@@ -396,6 +396,11 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
         processAllMapper.physicalDeleteByProjectId(tableName, projectId);
     }
 
+    public void physicalDeleteById(String tableName, String id){
+        // 物理删除
+        processAllMapper.physicalDeleteById(tableName, id);
+    }
+
     public void specialTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
         // 特殊转办
         RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class);