Browse Source

sop新增数据

车车 4 tháng trước cách đây
mục cha
commit
07f302e077

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

@@ -33,7 +33,7 @@ public class SopController {
     @PostMapping("/insertSop")
     @Operation(summary = "创建SOP信息")
     @PreAuthorize("@ss.hasPermission('iscs:sop:create')")
-    public CommonResult<Long> insertSop(@Valid @RequestBody SopSaveReqVO createReqVO) {
+    public CommonResult<Boolean> insertSop(@Valid @RequestBody SopSaveReqVO createReqVO) {
         return success(sopService.createSop(createReqVO));
     }
 

+ 14 - 4
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/sop/vo/SopSaveReqVO.java

@@ -1,9 +1,10 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.sop.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
 
 @Schema(description = "管理后台 - SOP信息新增/修改 Request VO")
 @Data
@@ -47,4 +48,13 @@ public class SopSaveReqVO {
     @Schema(description = "备注", example = "你说的对")
     private String remark;
 
-}
+    @Schema(description = "流程步骤数据")
+    private List<SopWorkflowStepSaveReqVO> sopStepList;
+
+    @Schema(description = "点位数据")
+    private List<SopPointsSaveReqVO> sopPointsList;
+
+    @Schema(description = "关联人员信息")
+    private List<SopUserSaveReqVO> sopUserList;
+
+}

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

@@ -22,7 +22,7 @@ public interface SopService extends IService<SopDO> {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createSop(@Valid SopSaveReqVO createReqVO);
+    Boolean createSop(@Valid SopSaveReqVO createReqVO);
 
     /**
      * 更新SOP信息

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

@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.iscs.dal.mysql.sop.SopMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.List;
@@ -28,15 +29,36 @@ public class SopServiceImpl extends ServiceImpl<SopMapper, SopDO> implements Sop
 
     @Resource
     private SopMapper sopMapper;
+    @Resource
+    private SopUserService sopUserService;
+    @Resource
+    private SopPointsService sopPointsService;
+    @Resource
+    private SopWorkflowStepService sopWorkflowStepService;
 
+    @Transactional
     @Override
-    public Long createSop(SopSaveReqVO createReqVO) {
+    public Boolean createSop(SopSaveReqVO vo) {
         // 插入
-        SopDO sop = BeanUtils.toBean(createReqVO, SopDO.class);
+        SopDO sop = BeanUtils.toBean(vo, SopDO.class);
         sopMapper.insert(sop);
-
+        // 新增人员信息
+        if (!vo.getSopUserList().isEmpty()) {
+            vo.getSopUserList().forEach(o -> o.setSopId(sop.getId()));
+            sopUserService.createSopUser(vo.getSopUserList());
+        }
+        // 新增隔离点信息
+        if (!vo.getSopPointsList().isEmpty()) {
+            vo.getSopPointsList().forEach(o -> o.setSopId(sop.getId()));
+            sopPointsService.createSopPoints(vo.getSopPointsList());
+        }
+        // 新增流程步骤信息
+        if (!vo.getSopStepList().isEmpty()) {
+            vo.getSopStepList().forEach(o -> o.setSopId(sop.getId()));
+            sopWorkflowStepService.createSopWorkflowStep(vo.getSopStepList());
+        }
         // 返回
-        return sop.getId();
+        return true;
     }
 
     @Override