|
@@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainW
|
|
|
import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbom.vo.IotMainWorkOrderBomPageReqVO;
|
|
|
import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
|
|
|
import cn.iocoder.yudao.module.pms.dal.dataobject.iotmainworkorder.IotMainWorkOrderDO;
|
|
|
+import cn.iocoder.yudao.module.pms.service.iotdeviceperson.IotDevicePersonService;
|
|
|
import cn.iocoder.yudao.module.pms.service.iotmainworkorder.IotMainWorkOrderService;
|
|
|
import cn.iocoder.yudao.module.pms.service.iotmainworkorderbom.IotMainWorkOrderBomService;
|
|
|
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
|
|
@@ -26,6 +27,7 @@ import cn.iocoder.yudao.module.system.service.dept.DeptService;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -61,6 +63,8 @@ public class IotMainWorkOrderController {
|
|
|
private IotMainWorkOrderBomService iotMainWorkOrderBomService;
|
|
|
@Resource
|
|
|
private DeptService deptService;
|
|
|
+ @Autowired
|
|
|
+ private IotDevicePersonService iotDevicePersonService;
|
|
|
|
|
|
@PostMapping("/create")
|
|
|
@Operation(summary = "创建保养工单")
|
|
@@ -185,10 +189,15 @@ public class IotMainWorkOrderController {
|
|
|
// 设备部门信息
|
|
|
Map<Long, DeptDO> deptMap = deptService.getDeptMap(
|
|
|
convertList(devices, IotDeviceRespVO::getDeptId));
|
|
|
+ // 查询设备责任人
|
|
|
+ // 查询设备关联的 负责人
|
|
|
+ Map<Long, String> devicePersonNames = iotDevicePersonService.getIotDevicePerson(convertList(devices, IotDeviceRespVO::getId));
|
|
|
// 2. 拼接数据
|
|
|
return BeanUtils.toBean(devices, IotDeviceRespVO.class, (deviceVO) -> {
|
|
|
// 2.1 拼接部门信息
|
|
|
findAndThen(deptMap, deviceVO.getDeptId(), dept -> deviceVO.setDeptName(dept.getName()));
|
|
|
+ // 2.2 设备关联的负责人姓名
|
|
|
+ findAndThen(devicePersonNames, deviceVO.getId(), person -> deviceVO.setResponsibleNames(person));
|
|
|
});
|
|
|
}
|
|
|
|