新增流程步骤物理删除

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workflow/WorkflowStepController.java

@@ -1,33 +1,26 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workflow;
 
-import org.springframework.web.bind.annotation.*;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowStepPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowStepRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowStepSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.workflow.WorkflowStepDO;
+import cn.iocoder.yudao.module.iscs.service.workflow.WorkflowStepService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
+import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
+import java.util.List;
 
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workflow.WorkflowStepDO;
-import cn.iocoder.yudao.module.iscs.service.workflow.WorkflowStepService;
-
 @Tag(name = "管理后台 - 工作流步骤")
 @RestController
 @RequestMapping("/iscs/workflow-step")
@@ -52,5 +45,14 @@ public class WorkflowStepController {
         return success(BeanUtils.toBean(pageResult, WorkflowStepRespVO.class));
     }
 
+    @DeleteMapping("/deleteWorkflowStepList")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除工作流步骤")
+    @PreAuthorize("@ss.hasPermission('iscs:workflow-step:delete')")
+    public CommonResult<Boolean> deleteWorkflowStepList(@RequestParam("ids") List<Long> ids) {
+        workflowStepService.deleteWorkflowStepList(ids);
+        return success(true);
+    }
+
 
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/workflow/WorkflowStepTemplateMapper.java

@@ -1,11 +1,15 @@
 package cn.iocoder.yudao.module.iscs.dal.mysql.workflow;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowStepTemplatePageReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workflow.WorkflowStepTemplateDO;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 工作流步骤模板 Mapper
@@ -41,4 +45,15 @@ public interface WorkflowStepTemplateMapper extends BaseMapperX<WorkflowStepTemp
                 .orderByDesc(WorkflowStepTemplateDO::getId));
     }
 
+    @Delete({
+            "<script>",
+            "DELETE FROM isc_workflow_step_template",
+            "WHERE id IN",
+            "<foreach item='id' collection='ids' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+
+    })
+    Boolean physicalDeleteByIds(@Param(value = "ids") List<Long> ids);
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workflow/WorkflowStepService.java

@@ -39,4 +39,12 @@ public interface WorkflowStepService extends IService<WorkflowStepDO> {
      */
     PageResult<WorkflowStepDO> getWorkflowStepPage(WorkflowStepPageReqVO pageReqVO);
 
+    /**
+     * 批量删除工作流步骤
+     * @param ids 编号
+     */
+    void deleteWorkflowStepList(List<Long> ids);
+
+
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workflow/WorkflowStepServiceImpl.java

@@ -77,4 +77,9 @@ public class WorkflowStepServiceImpl extends ServiceImpl<WorkflowStepMapper, Wor
         return workflowStepMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public void deleteWorkflowStepList(List<Long> ids) {
+        workflowStepMapper.physicalDeleteByIds(ids);
+    }
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workflow/WorkflowStepTemplateService.java

@@ -1,13 +1,13 @@
 package cn.iocoder.yudao.module.iscs.service.workflow;
 
-import java.util.*;
-
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowStepTemplatePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowStepTemplateSaveReqVO;
-import jakarta.validation.*;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workflow.WorkflowStepTemplateDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * 工作流步骤模板 Service 接口
@@ -31,13 +31,6 @@ public interface WorkflowStepTemplateService extends IService<WorkflowStepTempla
      */
     void updateWorkflowStepTemplate(@Valid WorkflowStepTemplateSaveReqVO updateReqVO);
 
-    /**
-     * 删除工作流步骤模板
-     *
-     * @param id 编号
-     */
-    void deleteWorkflowStepTemplate(Long id);
-
     /**
     * 批量删除工作流步骤模板
     *

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workflow/WorkflowStepTemplateServiceImpl.java

@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowStepTemplatePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowStepTemplateSaveReqVO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workflow.WorkflowStepDO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workflow.WorkflowStepTemplateDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.workflow.WorkflowStepTemplateMapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -84,16 +83,10 @@ public class WorkflowStepTemplateServiceImpl extends ServiceImpl<WorkflowStepTem
         workflowStepTemplateMapper.updateById(updateObj);
     }
 
-    @Override
-    public void deleteWorkflowStepTemplate(Long id) {
-        // 删除
-        workflowStepTemplateMapper.deleteById(id);
-    }
-
     @Override
         public void deleteWorkflowStepTemplateListByIds(List<Long> ids) {
         // 删除
-        workflowStepTemplateMapper.deleteByIds(ids);
+        workflowStepTemplateMapper.physicalDeleteByIds(ids);
         }