pms 保养工单列表 添加 所属队伍

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorder/IotMainWorkOrderController.java

@@ -134,6 +134,9 @@ public class IotMainWorkOrderController {
     @PreAuthorize("@ss.hasPermission('pms:iot-main-work-order:query')")
     public CommonResult<PageResult<IotMainWorkOrderRespVO>> sortedMainWorkOrderPage(@Valid IotMainWorkOrderPageReqVO pageReqVO) {
         PageResult<IotMainWorkOrderRespVO> pageResult = iotMainWorkOrderService.sortedMainWorkOrderPage(pageReqVO);
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(new PageResult<>(pageResult.getTotal()));
+        }
         return success(new PageResult<>(buildSortedMainWorkOrders(pageResult.getList()), pageResult.getTotal()));
     }
 
@@ -223,10 +226,15 @@ public class IotMainWorkOrderController {
         if (CollUtil.isEmpty(orders)) {
             return Collections.emptyList();
         }
+        // 返回工单所属部门
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(
+                convertList(orders, IotMainWorkOrderRespVO::getDeptId));
         // 查询保养计划 负责人
         Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(orders,
                 order -> Stream.of(NumberUtils.parseLong(order.getResponsiblePerson()))));
         return BeanUtils.toBean(orders, IotMainWorkOrderRespVO.class, orderVO -> {
+            // 2.1 拼接部门信息
+            findAndThen(deptMap, orderVO.getDeptId(), dept -> orderVO.setDeptName(dept.getName()));
             // 设置创建人、负责人名称
             MapUtils.findAndThen(userMap, NumberUtils.parseLong(orderVO.getResponsiblePerson()),
                     user -> orderVO.setResponsiblePersonName(user.getNickname()));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorder/vo/IotMainWorkOrderRespVO.java

@@ -109,6 +109,9 @@ public class IotMainWorkOrderRespVO {
     /**
      * 扩展字段
      */
+    @Schema(description = "部门名称")
+    private String deptName;
+
     @Schema(description = "距离保养时间 单位可能是 H D KM")
     private String mainDistance;