y01000846/spdm-backend-yangyang
1
0
Fork 0
forked from toolchaintechnologycenter/spdm-backend
Code Pull Requests Activity

fix:仿真策划获取树的req设置tag

Browse Source
This commit is contained in:
zhuxinru
2026-02-26 18:41:25 +08:00
parent 486e4e3db6
commit 067884e4d3
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
project/src/main/java/com/sdm/project/model/req/ProjectTreeTagReq.java
View File

@@ -39,15 +39,6 @@ public class ProjectTreeTagReq {
}
req.setIdMap(idMap);
// 构建tagMap（完全固定）
req.setTagMap(Arrays.asList(
new TaskNodeTag("project", "tag1"),
new TaskNodeTag("phase", "tag2"),
new TaskNodeTag("machine", "tag4"),
new TaskNodeTag("workspace", "tag5"),
new TaskNodeTag("discipline", "tag6")
));
return req;
}
}

16
project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
View File

@@ -27,6 +27,7 @@ import com.sdm.common.feign.impl.system.ApproveFeignClientImpl;
import com.sdm.common.feign.impl.system.MessageFeignClientImpl;
import com.sdm.common.feign.impl.system.SysUserFeignClientImpl;
import com.sdm.common.service.BaseService;
import com.sdm.common.service.TagMapService;
import com.sdm.common.utils.RandomUtil;
import com.sdm.common.utils.SystemOperate;
import com.sdm.common.utils.excel.ExcelUtil;
@@ -112,6 +113,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
@Autowired
private ApproveFeignClientImpl approveFeignClient;
@Autowired
private TagMapService tagMapService;
@Value("${commitmentDeadlineStatusTask.schedule.calculationInterval:5}")
private int calculationInterval;
@@ -2568,6 +2572,12 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
return response;
} else {
ProjectTreeTagReq getTaskTreeReq = ProjectTreeTagReq.buildForProjectAndPhase(req.getProjectNodeId(), req.getPhaseNodeId());
// 构建tagMap，从数据字典查
Map<String, String> TagMap = tagMapService.getTagMapName();
List<TaskNodeTag> tagList = TagMap.entrySet().stream()
.map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue()))
.toList();
getTaskTreeReq.setTagMap(tagList);
SdmResponse treeRespond = getTaskTree(getTaskTreeReq);
if (treeRespond.getData() != null) {
String viewContents = JSONObject.toJSONString(treeRespond.getData());
@@ -2599,6 +2609,12 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
return response;
} else {
ProjectTreeTagReq getTaskTreeReq = ProjectTreeTagReq.buildForProjectAndPhase(req.getProjectNodeId(), req.getPhaseNodeId());
// 构建tagMap，从数据字典查
Map<String, String> TagMap = tagMapService.getTagMapName();
List<TaskNodeTag> tagList = TagMap.entrySet().stream()
.map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue()))
.toList();
getTaskTreeReq.setTagMap(tagList);
SdmResponse treeRespond = getTaskTree(getTaskTreeReq);
if (treeRespond.getData() != null) {
String viewContents = JSONObject.toJSONString(treeRespond.getData());