设备台账详情添加tab

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/IotInspectOrderController.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.inspect.order;
 
+import cn.hutool.core.collection.CollUtil;
 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;
@@ -14,9 +15,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.service.IotDeviceService;
-import cn.iocoder.yudao.module.pms.service.inspect.IotInspectOrderDetailService;
 import cn.iocoder.yudao.module.pms.service.inspect.IotInspectOrderService;
-import cn.iocoder.yudao.module.pms.service.inspect.IotInspectRouteService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -33,6 +32,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -48,13 +48,9 @@ public class IotInspectOrderController {
     @Resource
     private IotInspectOrderService iotInspectOrderService;
     @Autowired
-    private IotInspectOrderDetailService iotInspectOrderDetailService;
-    @Autowired
     private IotInspectOrderDetailMapper iotInspectOrderDetailMapper;
     @Autowired
     private IotDeviceService iotDeviceService;
-    @Autowired
-    private IotInspectRouteService iotInspectRouteService;
 
     @PostMapping("/create")
     @Operation(summary = "创建巡检工单")
@@ -139,6 +135,20 @@ public class IotInspectOrderController {
         return success(BeanUtils.toBean(pageResult, IotInspectOrderRespVO.class));
     }
 
+    @GetMapping("/device/page")
+    @Operation(summary = "获得设备的巡检工单信息")
+    @PreAuthorize("@ss.hasPermission('rq:iot-inspect-order:query')")
+    public CommonResult<PageResult<IotInspectOrderRespVO>> getDeviceIotInspectOrderPage(@Valid IotInspectOrderPageReqVO pageReqVO) {
+        Set<Long> orderIds = iotInspectOrderDetailMapper.selectList("device_id", pageReqVO.getDeviceIds()).stream().map(IotInspectOrderDetailDO::getOrderId).collect(Collectors.toSet());
+        if (CollUtil.isEmpty(orderIds)) {
+            return success(new PageResult<>(0L));
+        }
+        pageReqVO.setIdList(orderIds);
+        pageReqVO.setDeviceIds(null);
+        PageResult<IotInspectOrderDO> pageResult = iotInspectOrderService.getIotInspectOrderPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotInspectOrderRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出巡检工单 Excel")
     @PreAuthorize("@ss.hasPermission('rq:iot-inspect-order:export')")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/vo/IotInspectOrderPageReqVO.java

@@ -40,4 +40,6 @@ public class IotInspectOrderPageReqVO extends PageParam {
     private String type;
 
     private Long charge;
+
+    private Collection<Long> idList;
 }

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

@@ -20,7 +20,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IotInspectOrderMapper extends BaseMapperX<IotInspectOrderDO> {
 
-    default PageResult<IotInspectOrderDO> selectPage(IotInspectOrderPageReqVO reqVO, Collection<Long> ids) {
+    default PageResult<IotInspectOrderDO> selectPage(IotInspectOrderPageReqVO reqVO, Collection<Long> ids, Collection<Long> idList) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotInspectOrderDO>()
                 .likeIfPresent(IotInspectOrderDO::getInspectOrderTitle, reqVO.getInspectOrderTitle())
                 .eqIfPresent(IotInspectOrderDO::getInspectOrderCode, reqVO.getInspectOrderCode())
@@ -28,6 +28,7 @@ public interface IotInspectOrderMapper extends BaseMapperX<IotInspectOrderDO> {
                 .eqIfPresent(IotInspectOrderDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotInspectOrderDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(IotInspectOrderDO::getDeptId, ids)
+                .inIfPresent(IotInspectOrderDO::getId, idList)
                 .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/service/inspect/IotInspectOrderServiceImpl.java

@@ -155,7 +155,7 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
             ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
             ids.add(pageReqVO.getDeptId());
         }
-        return iotInspectOrderMapper.selectPage(pageReqVO, ids);
+        return iotInspectOrderMapper.selectPage(pageReqVO, ids, pageReqVO.getIdList());
     }
 
 }