数据权限

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/bom/vo/IotMaintainBomSaveReqVO.java

@@ -24,6 +24,9 @@ public class IotMaintainBomSaveReqVO {
     @NotEmpty(message = "维修项名称不能为空")
     private String name;
 
+    @Schema(description = "物料数量")
+    private Integer materialCount;
+
     @Schema(description = "备注", example = "你猜")
     private String remark;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/failure/IotFailureReportMapper.java

@@ -6,6 +6,7 @@ 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.module.pms.controller.admin.failure.vo.IotFailureReportPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.failure.IotFailureReportDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -17,7 +18,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IotFailureReportMapper extends BaseMapperX<IotFailureReportDO> {
 
-    default PageResult<IotFailureReportDO> selectPage(IotFailureReportPageReqVO reqVO) {
+    default PageResult<IotFailureReportDO> selectPage(IotFailureReportPageReqVO reqVO, Collection<Long> ids) {
 
         return selectPage(reqVO, new LambdaQueryWrapperX<IotFailureReportDO>()
                 .likeIfPresent(IotFailureReportDO::getFailureCode, reqVO.getFailureCode())
@@ -34,7 +35,7 @@ public interface IotFailureReportMapper extends BaseMapperX<IotFailureReportDO>
                 .eqIfPresent(IotFailureReportDO::getNeedHelp, reqVO.getNeedHelp())
                 .eqIfPresent(IotFailureReportDO::getSolution, reqVO.getSolution())
                 .eqIfPresent(IotFailureReportDO::getRemark, reqVO.getRemark())
-                .eqIfPresent(IotFailureReportDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotFailureReportDO::getDeptId, ids)
                 .betweenIfPresent(IotFailureReportDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(IotFailureReportDO::getId));
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectOrderMapper.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.failure.vo.IotFailureReportP
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.vo.IotInspectOrderPageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.failure.IotFailureReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -19,14 +20,14 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IotInspectOrderMapper extends BaseMapperX<IotInspectOrderDO> {
 
-    default PageResult<IotInspectOrderDO> selectPage(IotInspectOrderPageReqVO reqVO) {
+    default PageResult<IotInspectOrderDO> selectPage(IotInspectOrderPageReqVO reqVO, Collection<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotInspectOrderDO>()
                 .likeIfPresent(IotInspectOrderDO::getInspectOrderTitle, reqVO.getInspectOrderTitle())
                 .eqIfPresent(IotInspectOrderDO::getInspectOrderCode, reqVO.getInspectOrderCode())
                 .eqIfPresent(IotInspectOrderDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(IotInspectOrderDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotInspectOrderDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(IotInspectOrderDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotInspectOrderDO::getDeptId, ids)
                 .eqIfPresent(IotInspectOrderDO::getDeviceIds, reqVO.getDeviceIds())
                 .eqIfPresent(IotInspectOrderDO::getCharge, reqVO.getCharge())
                 .orderByDesc(IotInspectOrderDO::getId));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectPlanMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.plan.vo.IotInspectPlanPageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -17,7 +18,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IotInspectPlanMapper extends BaseMapperX<IotInspectPlanDO> {
 
-    default PageResult<IotInspectPlanDO> selectPage(IotInspectPlanPageReqVO reqVO) {
+    default PageResult<IotInspectPlanDO> selectPage(IotInspectPlanPageReqVO reqVO, Collection<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotInspectPlanDO>()
                 .likeIfPresent(IotInspectPlanDO::getPlanTitle, reqVO.getPlanTitle())
                 .eqIfPresent(IotInspectPlanDO::getPlanCode, reqVO.getPlanCode())
@@ -27,7 +28,7 @@ public interface IotInspectPlanMapper extends BaseMapperX<IotInspectPlanDO> {
                 .eqIfPresent(IotInspectPlanDO::getDeviceIds, reqVO.getDeviceIds())
                 .eqIfPresent(IotInspectPlanDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotInspectPlanDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(IotInspectPlanDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotInspectPlanDO::getDeptId, ids)
                 .orderByDesc(IotInspectPlanDO::getId));
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/maintain/IotMaintainMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.pms.controller.admin.failure.vo.IotFailureReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.failure.IotFailureReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -19,7 +20,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IotMaintainMapper extends BaseMapperX<IotMaintainDO> {
 
-    default PageResult<IotMaintainDO> selectPage(IotMaintainPageReqVO reqVO) {
+    default PageResult<IotMaintainDO> selectPage(IotMaintainPageReqVO reqVO, Collection<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotMaintainDO>()
                 .likeIfPresent(IotMaintainDO::getFailureCode, reqVO.getFailureCode())
                 .likeIfPresent(IotMaintainDO::getFailureName, reqVO.getFailureName())
@@ -39,7 +40,7 @@ public interface IotMaintainMapper extends BaseMapperX<IotMaintainDO> {
                 .likeIfPresent(IotMaintainDO::getDeviceName, reqVO.getDeviceName())
                 .eqIfPresent(IotMaintainDO::getProcessInstanceId, reqVO.getProcessInstanceId())
                 .eqIfPresent(IotMaintainDO::getAuditStatus, reqVO.getAuditStatus())
-                .eqIfPresent(IotMaintainDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotMaintainDO::getDeptId, ids)
                 .orderByDesc(IotMaintainDO::getId));
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/failure/IotFailureReportServiceImpl.java

@@ -193,7 +193,12 @@ public class IotFailureReportServiceImpl implements IotFailureReportService {
 
     @Override
     public PageResult<IotFailureReportDO> getIotFailureReportPage(IotFailureReportPageReqVO pageReqVO) {
-        return iotFailureReportMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotFailureReportMapper.selectPage(pageReqVO, ids);
     }
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectOrderServiceImpl.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDetailDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderDetailMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderMapper;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import com.google.common.collect.ImmutableMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,9 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_INSPECT_ORDER_DETAIL_NOT_EXISTS;
@@ -37,6 +36,8 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
     private IotInspectOrderMapper iotInspectOrderMapper;
     @Autowired
     private IotInspectOrderDetailMapper iotInspectOrderDetailMapper;
+    @Resource
+    private DeptService deptService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -149,7 +150,12 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
 
     @Override
     public PageResult<IotInspectOrderDO> getIotInspectOrderPage(IotInspectOrderPageReqVO pageReqVO) {
-        return iotInspectOrderMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotInspectOrderMapper.selectPage(pageReqVO, ids);
     }
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectPlanServiceImpl.java

@@ -10,14 +10,14 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectPlanMapper;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -36,6 +36,8 @@ public class IotInspectPlanServiceImpl implements IotInspectPlanService {
     private IotInspectPlanMapper iotInspectPlanMapper;
     @Autowired
     private AdminUserApi adminUserApi;
+    @Resource
+    private DeptService deptService;
     @Override
     public void updateInspectPlanStatus(Long id, Integer status) {
         IotInspectPlanDO iotInspectPlanDO = iotInspectPlanMapper.selectById(id).setStatus(status);
@@ -93,7 +95,12 @@ public class IotInspectPlanServiceImpl implements IotInspectPlanService {
 
     @Override
     public PageResult<IotInspectPlanDO> getIotInspectPlanPage(IotInspectPlanPageReqVO pageReqVO) {
-        return iotInspectPlanMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotInspectPlanMapper.selectPage(pageReqVO, ids);
     }
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/maintain/IotMaintainServiceImpl.java

@@ -40,6 +40,7 @@ import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
 import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import com.google.common.collect.ImmutableMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -93,6 +94,8 @@ public class IotMaintainServiceImpl implements IotMaintainService {
     private IotProductClassifyService iotProductClassifyService;
     @Autowired
     private IotInformationDbMapper iotInformationDbMapper;
+    @Resource
+    private DeptService deptService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -314,7 +317,12 @@ public class IotMaintainServiceImpl implements IotMaintainService {
 
     @Override
     public PageResult<IotMaintainDO> getIotMaintainPage(IotMaintainPageReqVO pageReqVO) {
-        return iotMaintainMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotMaintainMapper.selectPage(pageReqVO, ids);
     }
 
 }