新增sop设置人员信息，详情查看sop中人员信息

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsLockTypeController.java

@@ -27,9 +27,9 @@ import java.util.List;
  * @author cgj
  * @date 2024-11-12
  */
-@Api(tags = "物资类型")
+@Api(tags = "锁具类型")
 @RestController
-@RequestMapping("/iscs/type")
+@RequestMapping("/iscs/lockType")
 public class IsLockTypeController extends BaseController
 {
     @Autowired

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/sop/AddSopDTO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * SOP信息对象 is_sop
@@ -39,4 +40,7 @@ public class AddSopDTO implements Serializable {
     @ApiModelProperty(value = "隔离点id， 多个用逗号分隔")
     private String pointIds;
 
+    @ApiModelProperty(value = "关联人员信息")
+    private List<AddSopUserDTO> ticketUserDTOList;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/sop/AddSopUserDTO.java

@@ -0,0 +1,28 @@
+package com.ktg.iscs.domain.dto.sop;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 作业票用户对象 is_job_ticket_user
+ *
+ * @author cgj
+ * @date 2024-10-18
+ */
+@Data
+public class AddSopUserDTO
+{
+
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+    @ApiModelProperty(value = "用户类型(0内部 1外部)")
+    private String userType;
+
+    @ApiModelProperty(value = "作业票角色(sys_role表中role_key)")
+    private String userRole;
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/ticket/AddTicketUserDTO.java

@@ -19,10 +19,10 @@ public class AddTicketUserDTO
     @ApiModelProperty(value = "用户名称")
     private String userName;
 
-    @ApiModelProperty(value = "用户类型")
+    @ApiModelProperty(value = "用户类型(0内部 1外部)")
     private String userType;
 
-    @ApiModelProperty(value = "作业票角色")
+    @ApiModelProperty(value = "作业票角色(sys_role表中role_key)")
     private String userRole;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/sop/SopDetailVO.java

@@ -1,6 +1,7 @@
 package com.ktg.iscs.domain.vo.sop;
 
 import com.ktg.common.core.domain.model.BaseBean;
+import com.ktg.iscs.domain.dto.sop.AddSopUserDTO;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -50,4 +51,7 @@ public class SopDetailVO extends BaseBean
    @ApiModelProperty(value = "隔离点数据")
    private List<PointDetailVO>  pointDetailVOList;
 
+    @ApiModelProperty(value = "关联人员信息")
+    private List<AddSopUserDTO> ticketUserDTOList;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsTypeServiceImpl.java

@@ -138,6 +138,14 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
             String collect = isMaterialsTypes.stream().map(IsMaterialsType::getMaterialsTypeName).collect(Collectors.joining(","));
             Assert.isTrue(false, collect + "分类下有物资，不可删除！");
 
+        }
+        // 查询有没有子类，有的话不能删除
+        List<IsMaterialsType> materialsTypes = list(Wrappers.<IsMaterialsType>lambdaQuery()
+                .in(IsMaterialsType::getParentId, materialsTypeIds));
+        if (!materialsTypes.isEmpty()) {
+            String collect = materialsTypes.stream().map(IsMaterialsType::getMaterialsTypeName).collect(Collectors.joining(","));
+            Assert.isTrue(false, collect + "分类下有子类，不可删除！");
+
         }
         // 开始删除
         int i = isMaterialsTypeMapper.deleteIsMaterialsTypeByMaterialsTypeIds(longIds);

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsSopServiceImpl.java

@@ -8,7 +8,9 @@ import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.bean.BeanUtils;
 import com.ktg.iscs.domain.IsSop;
 import com.ktg.iscs.domain.IsSopPoints;
+import com.ktg.iscs.domain.IsSopUser;
 import com.ktg.iscs.domain.dto.sop.AddSopDTO;
+import com.ktg.iscs.domain.dto.sop.AddSopUserDTO;
 import com.ktg.iscs.domain.dto.sop.PageSopDTO;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
 import com.ktg.iscs.domain.vo.sop.SopDetailVO;
@@ -17,6 +19,7 @@ import com.ktg.iscs.mapper.IsSopMapper;
 import com.ktg.iscs.service.IIsIsolationPointService;
 import com.ktg.iscs.service.IIsSopPointsService;
 import com.ktg.iscs.service.IIsSopService;
+import com.ktg.iscs.service.IIsSopUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,6 +43,8 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
     private IIsSopPointsService iIsSopPointsService;
     @Autowired
     private IIsIsolationPointService iIsIsolationPointService;
+    @Autowired
+    private IIsSopUserService iIsSopUserService;
 
     /**
      * 查询SOP信息
@@ -63,6 +68,12 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
             // 3.1组合返回数据
             sopDetailVO.setPointDetailVOList(pointDetailVOList);
         }
+        // 4.查询人员信息
+        List<IsSopUser> sopUserList = iIsSopUserService.list(Wrappers.<IsSopUser>lambdaQuery()
+                .eq(IsSopUser::getSopId, sopId));
+        if (!sopUserList.isEmpty()) {
+            sopDetailVO.setTicketUserDTOList(BeanUtils.toBean(sopUserList, AddSopUserDTO.class));
+        }
         return sopDetailVO;
     }
 
@@ -108,6 +119,17 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
             isSopPoints.setPointId(pointId);
             iIsSopPointsService.save(isSopPoints);
         }
+        // 4.新增人员信息到模板
+        if (!dto.getTicketUserDTOList().isEmpty()) {
+            for (AddSopUserDTO addSopUserDTO : dto.getTicketUserDTOList()) {
+                IsSopUser sopUser = BeanUtils.toBean(addSopUserDTO, IsSopUser.class);
+                sopUser.setSopId(isSop.getSopId());
+                if (null == addSopUserDTO.getUserId() || addSopUserDTO.getUserId() == 0) {
+                    addSopUserDTO.setUserId(0L);
+                }
+                iIsSopUserService.save(sopUser);
+            }
+        }
         return true;
     }