fix:更新任务所有结构细化完成时间、工位升级时间、清单下发时间
This commit is contained in:
2
.idea/MarsCodeWorkspaceAppSettings.xml
generated
2
.idea/MarsCodeWorkspaceAppSettings.xml
generated
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="com.codeverse.userSettings.MarscodeWorkspaceAppSettingsState">
|
||||
<option name="chatAppRouterInfo" value="builder/697757ee83e9f2b0bd667524" />
|
||||
<option name="chatAppRouterInfo" value="builder/6979cc3b1b9f71ea6ca8ed9f" />
|
||||
<option name="progress" value="1.0" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -2,7 +2,6 @@ package com.sdm.project.service.impl;
|
||||
|
||||
import com.alibaba.fastjson2.JSONArray;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.sdm.common.common.ResultCode;
|
||||
@@ -71,7 +70,6 @@ import javax.annotation.Resource;
|
||||
import java.lang.reflect.Field;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.Executor;
|
||||
@@ -1294,7 +1292,13 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
||||
.getSimulationNodeExtraByNodeIdAndPropertyName(projectUuid, PROPERTY_PROJECT_UNDERTAKER);
|
||||
|
||||
// 获取工位列表并分页
|
||||
List<ProjectNodePo> allWorkspaces = getWorkspaceListOrThrow(req.getNodeUuid());
|
||||
SdmResponse<List<ProjectNodePo>> response = getWorkspaceList(req.getNodeUuid());
|
||||
if (!response.isSuccess() || ObjectUtils.isEmpty(response.getData())) {
|
||||
log.error("[getDedicatedTime] 未查询到项目工位信息 ");
|
||||
return SdmResponse.success(new ArrayList<>());
|
||||
}
|
||||
List<ProjectNodePo> allWorkspaces = response.getData();
|
||||
|
||||
PageSlice<ProjectNodePo> pageSlice = sliceWorkspaces(allWorkspaces, req.getCurrent(), req.getSize());
|
||||
|
||||
// 批量查询当前页工位的扩展属性
|
||||
@@ -1333,18 +1337,12 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
||||
/**
|
||||
* 获取项目下所有工位,不存在则抛异常
|
||||
*/
|
||||
private List<ProjectNodePo> getWorkspaceListOrThrow(String nodeUuid) {
|
||||
SdmResponse<List<ProjectNodePo>> response = getChildrenNodeList(
|
||||
private SdmResponse<List<ProjectNodePo>> getWorkspaceList(String nodeUuid) {
|
||||
|
||||
return getChildrenNodeList(
|
||||
Collections.singletonList(nodeUuid),
|
||||
NodeTypeEnum.WORKSPACE.getValue()
|
||||
);
|
||||
|
||||
if (!response.isSuccess() || ObjectUtils.isEmpty(response.getData())) {
|
||||
log.error("[getDedicatedTime] 未查询到项目工位信息 projectUuid={}", nodeUuid);
|
||||
throw new IllegalStateException("未查询到项目工位信息");
|
||||
}
|
||||
|
||||
return response.getData();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user