修改流程模式

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

@@ -1,35 +1,32 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workflow;
 
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowModePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowModeRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowModeSaveReqVO;
-import org.springframework.web.bind.annotation.*;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.workflow.WorkflowModeDO;
+import cn.iocoder.yudao.module.iscs.service.workflow.WorkflowModeService;
+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.servlet.http.HttpServletResponse;
+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.apilog.core.enums.OperateTypeEnum.EXPORT;
 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.dal.dataobject.workflow.WorkflowModeDO;
-import cn.iocoder.yudao.module.iscs.service.workflow.WorkflowModeService;
-
 @Tag(name = "管理后台 - 工作流模式")
 @RestController
 @RequestMapping("/iscs/workflow-mode")
@@ -68,8 +65,8 @@ public class WorkflowModeController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('iscs:workflow-mode:query')")
     public CommonResult<WorkflowModeRespVO> selectWorkflowModeById(@RequestParam("id") Long id) {
-        WorkflowModeDO workflowMode = workflowModeService.getWorkflowMode(id);
-        return success(BeanUtils.toBean(workflowMode, WorkflowModeRespVO.class));
+        WorkflowModeRespVO workflowMode = workflowModeService.getWorkflowMode(id);
+        return success(workflowMode);
     }
 
     @GetMapping("/getWorkflowModePage")

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

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 工作流模式 Response VO")
 @Data
@@ -44,4 +45,7 @@ public class WorkflowModeRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "流程步骤")
+    private List<WorkflowStepRespVO> stepList;
+
 }

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

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iscs.service.workflow;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowModePageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowModeRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowModeSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workflow.WorkflowModeDO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -51,7 +52,7 @@ public interface WorkflowModeService extends IService<WorkflowModeDO> {
      * @param id 编号
      * @return 工作流模式
      */
-    WorkflowModeDO getWorkflowMode(Long id);
+    WorkflowModeRespVO getWorkflowMode(Long id);
 
     /**
      * 获得工作流模式分页

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

@@ -4,7 +4,9 @@ import cn.hutool.core.lang.Assert;
 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.WorkflowModePageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowModeRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowModeSaveReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workflow.vo.WorkflowStepRespVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workflow.WorkflowModeDO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workflow.WorkflowStepDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.workflow.WorkflowModeMapper;
@@ -92,8 +94,13 @@ public class WorkflowModeServiceImpl extends ServiceImpl<WorkflowModeMapper, Wor
 
 
     @Override
-    public WorkflowModeDO getWorkflowMode(Long id) {
-        return workflowModeMapper.selectById(id);
+    public WorkflowModeRespVO getWorkflowMode(Long id) {
+        WorkflowModeDO workflowModeDO = workflowModeMapper.selectById(id);
+        Assert.isTrue(workflowModeDO != null, "该数据不存在！");
+        WorkflowModeRespVO bean = BeanUtils.toBean(workflowModeDO, WorkflowModeRespVO.class);
+        List<WorkflowStepRespVO> stepByModeId = workflowStepService.getStepByModeId(id);
+        bean.setStepList(stepByModeId);
+        return bean;
     }
 
     @Override

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

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iscs.service.workflow;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 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 com.baomidou.mybatisplus.extension.service.IService;
@@ -53,6 +54,6 @@ public interface WorkflowStepService extends IService<WorkflowStepDO> {
      */
     void deleteWorkflowStepList(List<Long> ids);
 
-
+    List<WorkflowStepRespVO> getStepByModeId(Long modeId);
 
 }

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

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.iscs.service.workflow;
 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.dal.mysql.workflow.WorkflowStepMapper;
@@ -115,4 +116,13 @@ public class WorkflowStepServiceImpl extends ServiceImpl<WorkflowStepMapper, Wor
         workflowStepMapper.physicalDeleteByIds(ids);
     }
 
+    @Override
+    public List<WorkflowStepRespVO> getStepByModeId(Long modeId) {
+        Assert.notNull(modeId, "modeId不可为空!");
+        List<WorkflowStepDO> list = list(Wrappers.<WorkflowStepDO>lambdaQuery()
+                .eq(WorkflowStepDO::getModeId, modeId)
+                .orderByAsc(WorkflowStepDO::getStepIndex));
+        return BeanUtils.toBean(list, WorkflowStepRespVO.class);
+    }
+
 }