|
|
@@ -908,6 +908,16 @@ public class IotOpeationFillController {
|
|
|
IotOpeationFillDO fillDO = new IotOpeationFillDO();
|
|
|
fillDO.setId(id);
|
|
|
IotOpeationFillDO iotOpeationFill = iotOpeationFillService.getFillById(fillDO);
|
|
|
+ TenantUtils.executeIgnore(() -> {
|
|
|
+ IotProjectTaskPageReqVO reqVO = new IotProjectTaskPageReqVO();
|
|
|
+ reqVO.setDeptId(iotOpeationFill.getDeptId());
|
|
|
+ reqVO.setJobFlag("Y");
|
|
|
+ List<IotProjectTaskDO> tasks = iotProjectTaskMapper.selectList(reqVO);
|
|
|
+ if (CollUtil.isNotEmpty(tasks)) {
|
|
|
+ // 取最新的1个任务
|
|
|
+ iotOpeationFill.setWellName(tasks.get(0).getWellName());
|
|
|
+ }
|
|
|
+ });
|
|
|
return success(BeanUtils.toBean(iotOpeationFill, IotOpeationFillDO.class));
|
|
|
}
|
|
|
|
|
|
@@ -990,6 +1000,9 @@ public class IotOpeationFillController {
|
|
|
Map<Long, List<IotOpeationFillDO>> fillMap = allFillList.stream()
|
|
|
.collect(Collectors.groupingBy(IotOpeationFillDO::getOrderId)); // 假设IotOpeationFillDO有getOrderId方法
|
|
|
|
|
|
+ // 查询所有工单部门对应的队伍
|
|
|
+
|
|
|
+
|
|
|
// 5. 遍历处理结果
|
|
|
for (IotOpeationFillOrderDO orderDO : fillList.getList()) {
|
|
|
Long orderId = orderDO.getId();
|