草稿箱删除调整

src/main/java/com/xjrsoft/module/workflow/service/IWorkflowExecuteService.java

@@ -5,6 +5,7 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.workflow.dto.*;
 import com.xjrsoft.module.workflow.vo.*;
 
+import java.sql.SQLException;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -10,6 +10,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.db.Db;
 import cn.hutool.db.Session;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.json.JSONUtil;
@@ -42,6 +43,7 @@ import com.xjrsoft.common.enums.YesOrNoEnum;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.DatasourceUtil;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
@@ -208,6 +210,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.ssssssss.magicapi.core.service.MagicAPIService;
 
+import javax.sql.DataSource;
+import java.sql.SQLException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -4111,7 +4115,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
     }
 
     @Override
-    public boolean deleteDraft(List<Long> ids) {
+    public boolean deleteDraft(List<Long> ids){
         //根据草稿箱查询对应的流程
         List<WorkflowDraft> list = workflowDraftService.list(
             new QueryWrapper<WorkflowDraft>()
@@ -4121,6 +4125,8 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
             .in(WorkflowDraft::getId, ids)
         );
         JsonParser parser = new JsonParser();
+        DataSource datasource = DatasourceUtil.getDataSource(GlobalConstant.DEFAULT_DATASOURCE_KEY);
+        Db use = Db.use(datasource);
         for (WorkflowDraft workflowDraft : list) {
             WorkflowSchema schema = workflowSchemaMapper.selectById(workflowDraft.getSchemaId());
             JsonObject JsonContent = parser.parse(schema.getJsonContent()).getAsJsonObject();
@@ -4134,7 +4140,14 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
             for (JsonElement tableConfig : tableConfigs) {
                 JsonObject table = tableConfig.getAsJsonObject();
                 if(workflowDraft.getDataId() != null &&  !"".equals(workflowDraft.getDataId())){
-                    workflowDraftService.deleteFormData(table.get("tableName").getAsString(), workflowDraft.getDataId());
+                    String sql = "delete from " + table.get("tableName").getAsString() + " where id = " + workflowDraft.getDataId();
+                    List<String> sqls = new ArrayList<>();
+                    sqls.add(sql);
+                    try {
+                        use.executeBatch(sqls);
+                    } catch (SQLException e) {
+                        throw new RuntimeException(e);
+                    }
                 }
             }
         }