修改sop关联数据list查询

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/sop/SopController.java

@@ -59,7 +59,7 @@ public class SopController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('iscs:sop:query')")
     public CommonResult<SopRespVO> selectSopById(@RequestParam("id") Long id) {
-        SopDO sop = sopService.getSop(id);
+        SopRespVO sop = sopService.getSop(id);
         return success(BeanUtils.toBean(sop, SopRespVO.class));
     }
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/sop/SopPointsController.java

@@ -72,4 +72,12 @@ public class SopPointsController {
         return success(BeanUtils.toBean(pageResult, SopPointsRespVO.class));
     }
 
+    @GetMapping("/getSopPointsList")
+    @Operation(summary = "获得SOP隔离点list")
+    @PreAuthorize("@ss.hasPermission('iscs:sop-points:query')")
+    public CommonResult<List<SopPointsRespVO>> getSopPointsList(@Valid SopPointsPageReqVO pageReqVO) {
+        List<SopPointsRespVO> list = sopPointsService.getSopPointsList(pageReqVO);
+        return success(list);
+    }
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/sop/SopUserController.java

@@ -72,4 +72,12 @@ public class SopUserController {
         return success(BeanUtils.toBean(pageResult, SopUserRespVO.class));
     }
 
+    @GetMapping("/getSopUserList")
+    @Operation(summary = "获得SOP用户LIST")
+    @PreAuthorize("@ss.hasPermission('iscs:sop-user:query')")
+    public CommonResult<List<SopUserRespVO>> getSopUserList(@Valid SopUserPageReqVO pageReqVO) {
+        List<SopUserRespVO> list = sopUserService.getSopUserList(pageReqVO);
+        return success(list);
+    }
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/sop/SopWorkflowStepController.java

@@ -72,4 +72,12 @@ public class SopWorkflowStepController {
         return success(BeanUtils.toBean(pageResult, SopWorkflowStepRespVO.class));
     }
 
+    @GetMapping("/getSopWorkflowStepList")
+    @Operation(summary = "获得工作流步骤list")
+    @PreAuthorize("@ss.hasPermission('iscs:sop-workflow-step:query')")
+    public CommonResult<List<SopWorkflowStepRespVO>> getSopWorkflowStepList(@Valid SopWorkflowStepPageReqVO pageReqVO) {
+        List<SopWorkflowStepRespVO> list = sopWorkflowStepService.getSopWorkflowStepList(pageReqVO);
+        return success(list);
+    }
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/sop/vo/SopRespVO.java

@@ -1,11 +1,12 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.sop.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
+import java.util.List;
 
 @Schema(description = "管理后台 - SOP信息 Response VO")
 @Data
@@ -64,4 +65,13 @@ public class SopRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-}
+    @Schema(description = "流程步骤数据")
+    private List<SopWorkflowStepSaveReqVO> sopStepList;
+
+    @Schema(description = "点位数据")
+    private List<SopPointsSaveReqVO> sopPointsList;
+
+    @Schema(description = "关联人员信息")
+    private List<SopUserSaveReqVO> sopUserList;
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/sop/SopPointsMapper.java

@@ -31,6 +31,18 @@ public interface SopPointsMapper extends BaseMapperX<SopPointsDO> {
                 .orderByDesc(SopPointsDO::getId));
     }
 
+    default List<SopPointsDO> selectList(SopPointsPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<SopPointsDO>()
+                .eqIfPresent(SopPointsDO::getSopId, reqVO.getSopId())
+                .eqIfPresent(SopPointsDO::getWorkshopId, reqVO.getWorkshopId())
+                .eqIfPresent(SopPointsDO::getWorkareaId, reqVO.getWorkareaId())
+                .eqIfPresent(SopPointsDO::getPointId, reqVO.getPointId())
+                .eqIfPresent(SopPointsDO::getPrePointId, reqVO.getPrePointId())
+                .eqIfPresent(SopPointsDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(SopPointsDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(SopPointsDO::getId));
+    }
+
     @Delete({
             "<script>",
             "DELETE FROM isc_sop_points",

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/sop/SopUserMapper.java

@@ -31,6 +31,18 @@ public interface SopUserMapper extends BaseMapperX<SopUserDO> {
                 .orderByDesc(SopUserDO::getId));
     }
 
+    default List<SopUserDO> selectList(SopUserPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<SopUserDO>()
+                .eqIfPresent(SopUserDO::getSopId, reqVO.getSopId())
+                .eqIfPresent(SopUserDO::getUserId, reqVO.getUserId())
+                .likeIfPresent(SopUserDO::getUserName, reqVO.getUserName())
+                .eqIfPresent(SopUserDO::getUserType, reqVO.getUserType())
+                .eqIfPresent(SopUserDO::getUserRole, reqVO.getUserRole())
+                .eqIfPresent(SopUserDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(SopUserDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(SopUserDO::getId));
+    }
+
     @Delete({
             "<script>",
             "DELETE FROM isc_sop_user",

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/sop/SopWorkflowStepMapper.java

@@ -47,6 +47,34 @@ public interface SopWorkflowStepMapper extends BaseMapperX<SopWorkflowStepDO> {
                 .orderByDesc(SopWorkflowStepDO::getId));
     }
 
+    default List<SopWorkflowStepDO> selectList(SopWorkflowStepPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<SopWorkflowStepDO>()
+                .eqIfPresent(SopWorkflowStepDO::getSopId, reqVO.getSopId())
+                .eqIfPresent(SopWorkflowStepDO::getStepId, reqVO.getStepId())
+                .eqIfPresent(SopWorkflowStepDO::getStepIndex, reqVO.getStepIndex())
+                .likeIfPresent(SopWorkflowStepDO::getStepName, reqVO.getStepName())
+                .eqIfPresent(SopWorkflowStepDO::getStepIcon, reqVO.getStepIcon())
+                .eqIfPresent(SopWorkflowStepDO::getStepTitle, reqVO.getStepTitle())
+                .eqIfPresent(SopWorkflowStepDO::getStepTitleShort, reqVO.getStepTitleShort())
+                .eqIfPresent(SopWorkflowStepDO::getStepDescription, reqVO.getStepDescription())
+                .eqIfPresent(SopWorkflowStepDO::getConfirmType, reqVO.getConfirmType())
+                .eqIfPresent(SopWorkflowStepDO::getConfirmRoleCode, reqVO.getConfirmRoleCode())
+                .eqIfPresent(SopWorkflowStepDO::getConfirmUser, reqVO.getConfirmUser())
+                .eqIfPresent(SopWorkflowStepDO::getEnableCancelJob, reqVO.getEnableCancelJob())
+                .eqIfPresent(SopWorkflowStepDO::getEnableSetLocker, reqVO.getEnableSetLocker())
+                .eqIfPresent(SopWorkflowStepDO::getEnableSetColocker, reqVO.getEnableSetColocker())
+                .eqIfPresent(SopWorkflowStepDO::getEnableAddColocker, reqVO.getEnableAddColocker())
+                .eqIfPresent(SopWorkflowStepDO::getGotoStepAfterAddingColocker, reqVO.getGotoStepAfterAddingColocker())
+                .eqIfPresent(SopWorkflowStepDO::getEnableReduceColocker, reqVO.getEnableReduceColocker())
+                .eqIfPresent(SopWorkflowStepDO::getEnableLock, reqVO.getEnableLock())
+                .eqIfPresent(SopWorkflowStepDO::getEnableColock, reqVO.getEnableColock())
+                .eqIfPresent(SopWorkflowStepDO::getEnableReleaseColock, reqVO.getEnableReleaseColock())
+                .eqIfPresent(SopWorkflowStepDO::getEnableUnlock, reqVO.getEnableUnlock())
+                .eqIfPresent(SopWorkflowStepDO::getEnableEndJob, reqVO.getEnableEndJob())
+                .betweenIfPresent(SopWorkflowStepDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(SopWorkflowStepDO::getId));
+    }
+
     @Delete({
             "<script>",
             "DELETE FROM isc_sop_workflow_step",

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopPointsService.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iscs.service.sop;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopPointsPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopPointsRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopPointsSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.sop.SopPointsDO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -55,4 +56,10 @@ public interface SopPointsService extends IService<SopPointsDO> {
      */
     PageResult<SopPointsDO> getSopPointsPage(SopPointsPageReqVO pageReqVO);
 
+    /**
+     * 获得SOP隔离点list
+     */
+    List<SopPointsRespVO> getSopPointsList(SopPointsPageReqVO pageReqVO);
+
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopPointsServiceImpl.java

@@ -5,6 +5,7 @@ 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.sop.vo.SopPointsPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopPointsRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopPointsSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.sop.SopPointsDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.sop.SopPointsMapper;
@@ -82,4 +83,9 @@ public class SopPointsServiceImpl extends ServiceImpl<SopPointsMapper, SopPoints
         return sopPointsMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<SopPointsRespVO> getSopPointsList(SopPointsPageReqVO pageReqVO) {
+        return BeanUtils.toBean(sopPointsMapper.selectList(pageReqVO), SopPointsRespVO.class);
+    }
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopService.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iscs.service.sop;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.sop.SopDO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -44,7 +45,7 @@ public interface SopService extends IService<SopDO> {
      * @param id 编号
      * @return SOP信息
      */
-    SopDO getSop(Long id);
+    SopRespVO getSop(Long id);
 
     /**
      * 获得SOP信息分页

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopServiceImpl.java

@@ -1,9 +1,11 @@
 package cn.iocoder.yudao.module.iscs.service.sop;
 
 import cn.hutool.core.collection.CollUtil;
+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.sop.vo.SopPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.sop.SopDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.sop.SopMapper;
@@ -92,8 +94,13 @@ public class SopServiceImpl extends ServiceImpl<SopMapper, SopDO> implements Sop
     }
 
     @Override
-    public SopDO getSop(Long id) {
-        return sopMapper.selectById(id);
+    public SopRespVO getSop(Long id) {
+        SopDO sopDO = sopMapper.selectById(id);
+        Assert.isTrue(sopDO != null, "数据不存在！");
+        SopRespVO bean = BeanUtils.toBean(sopDO, SopRespVO.class);
+
+
+        return bean;
     }
 
     @Override

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopUserService.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iscs.service.sop;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopUserPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopUserRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopUserSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.sop.SopUserDO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -54,4 +55,9 @@ public interface SopUserService extends IService<SopUserDO> {
      */
     PageResult<SopUserDO> getSopUserPage(SopUserPageReqVO pageReqVO);
 
+    /**
+     * 获得SOP用户list
+     */
+    List<SopUserRespVO> getSopUserList(SopUserPageReqVO pageReqVO);
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopUserServiceImpl.java

@@ -4,6 +4,7 @@ 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.sop.vo.SopUserPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopUserRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopUserSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.sop.SopUserDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.sop.SopUserMapper;
@@ -101,4 +102,9 @@ public class SopUserServiceImpl extends ServiceImpl<SopUserMapper, SopUserDO> im
         return sopUserMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<SopUserRespVO> getSopUserList(SopUserPageReqVO pageReqVO) {
+        return BeanUtils.toBean(sopUserMapper.selectList(pageReqVO), SopUserRespVO.class);
+    }
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopWorkflowStepService.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iscs.service.sop;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopWorkflowStepPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopWorkflowStepRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopWorkflowStepSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.sop.SopWorkflowStepDO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -54,4 +55,10 @@ public interface SopWorkflowStepService extends IService<SopWorkflowStepDO> {
      */
     PageResult<SopWorkflowStepDO> getSopWorkflowStepPage(SopWorkflowStepPageReqVO pageReqVO);
 
+    /**
+     * 获得工作流步骤list
+     */
+    List<SopWorkflowStepRespVO> getSopWorkflowStepList(SopWorkflowStepPageReqVO pageReqVO);
+
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopWorkflowStepServiceImpl.java

@@ -4,6 +4,7 @@ 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.sop.vo.SopWorkflowStepPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopWorkflowStepRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopWorkflowStepSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.sop.SopWorkflowStepDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.sop.SopWorkflowStepMapper;
@@ -79,4 +80,9 @@ public class SopWorkflowStepServiceImpl extends ServiceImpl<SopWorkflowStepMappe
         return sopWorkflowStepMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<SopWorkflowStepRespVO> getSopWorkflowStepList(SopWorkflowStepPageReqVO pageReqVO) {
+        return BeanUtils.toBean(sopWorkflowStepMapper.selectList(pageReqVO), SopWorkflowStepRespVO.class);
+    }
+
 }