toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、节点、任务的标签字段Tag，开头字母T修改为小写

Browse Source
This commit is contained in:
lidongyang
2025-11-18 13:48:07 +08:00
parent 3153d82e54
commit 81567dee64
15 changed files with 295 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
project/src/main/java/com/sdm/project/model/bo/ProjectNode.java
View File

@@ -211,24 +211,24 @@ public class ProjectNode extends BaseEntity {
private List<String> analyseSoftwareList;
@JsonProperty(value = "Tag1")
private List<String> Tag1;
@JsonProperty(value = "Tag2")
private List<String> Tag2;
@JsonProperty(value = "Tag3")
private List<String> Tag3;
@JsonProperty(value = "Tag4")
private List<String> Tag4;
@JsonProperty(value = "Tag5")
private List<String> Tag5;
@JsonProperty(value = "Tag6")
private List<String> Tag6;
@JsonProperty(value = "Tag7")
private List<String> Tag7;
@JsonProperty(value = "Tag8")
private List<String> Tag8;
@JsonProperty(value = "Tag9")
private List<String> Tag9;
@JsonProperty(value = "Tag10")
private List<String> Tag10;
@JsonProperty(value = "tag1")
private List<String> tag1;
@JsonProperty(value = "tag2")
private List<String> tag2;
@JsonProperty(value = "tag3")
private List<String> tag3;
@JsonProperty(value = "tag4")
private List<String> tag4;
@JsonProperty(value = "tag5")
private List<String> tag5;
@JsonProperty(value = "tag6")
private List<String> tag6;
@JsonProperty(value = "tag7")
private List<String> tag7;
@JsonProperty(value = "tag8")
private List<String> tag8;
@JsonProperty(value = "tag9")
private List<String> tag9;
@JsonProperty(value = "tag10")
private List<String> tag10;
}

40
project/src/main/java/com/sdm/project/model/bo/TaskNode.java
View File

@@ -231,26 +231,26 @@ public class TaskNode extends BaseEntity {
private String bCapacity;
private String flowTemplateName;
@JsonProperty(value = "Tag1")
private List<String> Tag1;
@JsonProperty(value = "Tag2")
private List<String> Tag2;
@JsonProperty(value = "Tag3")
private List<String> Tag3;
@JsonProperty(value = "Tag4")
private List<String> Tag4;
@JsonProperty(value = "Tag5")
private List<String> Tag5;
@JsonProperty(value = "Tag6")
private List<String> Tag6;
@JsonProperty(value = "Tag7")
private List<String> Tag7;
@JsonProperty(value = "Tag8")
private List<String> Tag8;
@JsonProperty(value = "Tag9")
private List<String> Tag9;
@JsonProperty(value = "Tag10")
private List<String> Tag10;
@JsonProperty(value = "tag1")
private List<String> tag1;
@JsonProperty(value = "tag2")
private List<String> tag2;
@JsonProperty(value = "tag3")
private List<String> tag3;
@JsonProperty(value = "tag4")
private List<String> tag4;
@JsonProperty(value = "tag5")
private List<String> tag5;
@JsonProperty(value = "tag6")
private List<String> tag6;
@JsonProperty(value = "tag7")
private List<String> tag7;
@JsonProperty(value = "tag8")
private List<String> tag8;
@JsonProperty(value = "tag9")
private List<String> tag9;
@JsonProperty(value = "tag10")
private List<String> tag10;
// private String tags1;
// private String tags2;

40
project/src/main/java/com/sdm/project/model/po/NodeAllBase.java
View File

@@ -191,25 +191,25 @@ public class NodeAllBase extends BaseEntity {
public String extras;
@JsonProperty(value = "Tag1")
private String Tag1;
@JsonProperty(value = "Tag2")
private String Tag2;
@JsonProperty(value = "Tag3")
private String Tag3;
@JsonProperty(value = "Tag4")
private String Tag4;
@JsonProperty(value = "Tag5")
private String Tag5;
@JsonProperty(value = "Tag6")
private String Tag6;
@JsonProperty(value = "Tag7")
private String Tag7;
@JsonProperty(value = "Tag8")
private String Tag8;
@JsonProperty(value = "Tag9")
private String Tag9;
@JsonProperty(value = "Tag10")
private String Tag10;
@JsonProperty(value = "tag1")
private String tag1;
@JsonProperty(value = "tag2")
private String tag2;
@JsonProperty(value = "tag3")
private String tag3;
@JsonProperty(value = "tag4")
private String tag4;
@JsonProperty(value = "tag5")
private String tag5;
@JsonProperty(value = "tag6")
private String tag6;
@JsonProperty(value = "tag7")
private String tag7;
@JsonProperty(value = "tag8")
private String tag8;
@JsonProperty(value = "tag9")
private String tag9;
@JsonProperty(value = "tag10")
private String tag10;
}

40
project/src/main/java/com/sdm/project/model/po/ProjectNodePo.java
View File

@@ -137,24 +137,24 @@ public class ProjectNodePo extends NodeAllBase {
private String folderId;
@JsonProperty(value = "Tag1")
private String Tag1;
@JsonProperty(value = "Tag2")
private String Tag2;
@JsonProperty(value = "Tag3")
private String Tag3;
@JsonProperty(value = "Tag4")
private String Tag4;
@JsonProperty(value = "Tag5")
private String Tag5;
@JsonProperty(value = "Tag6")
private String Tag6;
@JsonProperty(value = "Tag7")
private String Tag7;
@JsonProperty(value = "Tag8")
private String Tag8;
@JsonProperty(value = "Tag9")
private String Tag9;
@JsonProperty(value = "Tag10")
private String Tag10;
@JsonProperty(value = "tag1")
private String tag1;
@JsonProperty(value = "tag2")
private String tag2;
@JsonProperty(value = "tag3")
private String tag3;
@JsonProperty(value = "tag4")
private String tag4;
@JsonProperty(value = "tag5")
private String tag5;
@JsonProperty(value = "tag6")
private String tag6;
@JsonProperty(value = "tag7")
private String tag7;
@JsonProperty(value = "tag8")
private String tag8;
@JsonProperty(value = "tag9")
private String tag9;
@JsonProperty(value = "tag10")
private String tag10;
}

40
project/src/main/java/com/sdm/project/model/po/TaskNodePo.java
View File

@@ -158,25 +158,25 @@ public class TaskNodePo extends NodeAllBase {
private String englishName;
private String description;
@JsonProperty(value = "Tag1")
private String Tag1;
@JsonProperty(value = "Tag2")
private String Tag2;
@JsonProperty(value = "Tag3")
private String Tag3;
@JsonProperty(value = "Tag4")
private String Tag4;
@JsonProperty(value = "Tag5")
private String Tag5;
@JsonProperty(value = "Tag6")
private String Tag6;
@JsonProperty(value = "Tag7")
private String Tag7;
@JsonProperty(value = "Tag8")
private String Tag8;
@JsonProperty(value = "Tag9")
private String Tag9;
@JsonProperty(value = "Tag10")
private String Tag10;
@JsonProperty(value = "tag1")
private String tag1;
@JsonProperty(value = "tag2")
private String tag2;
@JsonProperty(value = "tag3")
private String tag3;
@JsonProperty(value = "tag4")
private String tag4;
@JsonProperty(value = "tag5")
private String tag5;
@JsonProperty(value = "tag6")
private String tag6;
@JsonProperty(value = "tag7")
private String tag7;
@JsonProperty(value = "tag8")
private String tag8;
@JsonProperty(value = "tag9")
private String tag9;
@JsonProperty(value = "tag10")
private String tag10;
}

40
project/src/main/java/com/sdm/project/model/req/ProjectTreeReq.java
View File

@@ -10,26 +10,26 @@ import java.util.List;
@Data
public class ProjectTreeReq {
@JsonProperty(value = "Tag1")
private String Tag1;
@JsonProperty(value = "Tag2")
private String Tag2;
@JsonProperty(value = "Tag3")
private String Tag3;
@JsonProperty(value = "Tag4")
private String Tag4;
@JsonProperty(value = "Tag5")
private String Tag5;
@JsonProperty(value = "Tag6")
private String Tag6;
@JsonProperty(value = "Tag7")
private String Tag7;
@JsonProperty(value = "Tag8")
private String Tag8;
@JsonProperty(value = "Tag9")
private String Tag9;
@JsonProperty(value = "Tag10")
private String Tag10;
@JsonProperty(value = "tag1")
private String tag1;
@JsonProperty(value = "tag2")
private String tag2;
@JsonProperty(value = "tag3")
private String tag3;
@JsonProperty(value = "tag4")
private String tag4;
@JsonProperty(value = "tag5")
private String tag5;
@JsonProperty(value = "tag6")
private String tag6;
@JsonProperty(value = "tag7")
private String tag7;
@JsonProperty(value = "tag8")
private String tag8;
@JsonProperty(value = "tag9")
private String tag9;
@JsonProperty(value = "tag10")
private String tag10;
}

40
project/src/main/java/com/sdm/project/model/req/SpdmNodeDetailReq.java
View File

@@ -103,26 +103,26 @@ public class SpdmNodeDetailReq extends BaseEntity {
private String group;
private String bCapacity;
@JsonProperty(value = "Tag1")
private String Tag1;
@JsonProperty(value = "Tag2")
private String Tag2;
@JsonProperty(value = "Tag3")
private String Tag3;
@JsonProperty(value = "Tag4")
private String Tag4;
@JsonProperty(value = "Tag5")
private String Tag5;
@JsonProperty(value = "Tag6")
private String Tag6;
@JsonProperty(value = "Tag7")
private String Tag7;
@JsonProperty(value = "Tag8")
private String Tag8;
@JsonProperty(value = "Tag9")
private String Tag9;
@JsonProperty(value = "Tag10")
private String Tag10;
@JsonProperty(value = "tag1")
private String tag1;
@JsonProperty(value = "tag2")
private String tag2;
@JsonProperty(value = "tag3")
private String tag3;
@JsonProperty(value = "tag4")
private String tag4;
@JsonProperty(value = "tag5")
private String tag5;
@JsonProperty(value = "tag6")
private String tag6;
@JsonProperty(value = "tag7")
private String tag7;
@JsonProperty(value = "tag8")
private String tag8;
@JsonProperty(value = "tag9")
private String tag9;
@JsonProperty(value = "tag10")
private String tag10;
private String exeStatus;
}

55
project/src/main/java/com/sdm/project/model/req/SpdmProjectNodeEditReq.java
View File

@@ -107,42 +107,27 @@ public class SpdmProjectNodeEditReq extends BaseEntity {
private String group;
private String bCapacity;
// @JsonProperty(value = "Tag1")
// private String Tag1;
// @JsonProperty(value = "Tag2")
// private String Tag2;
// @JsonProperty(value = "Tag3")
// private String Tag3;
// @JsonProperty(value = "Tag4")
// private String Tag4;
// @JsonProperty(value = "Tag5")
// private List<String> Tag5;
// private List<String> Tag6;
// private List<String> Tag7;
// private List<String> Tag8;
// private List<String> Tag9;
// private List<String> Tag10;
@JsonProperty(value = "Tag1")
private String Tag1;
@JsonProperty(value = "Tag2")
private String Tag2;
@JsonProperty(value = "Tag3")
private String Tag3;
@JsonProperty(value = "Tag4")
private String Tag4;
@JsonProperty(value = "Tag5")
private String Tag5;
@JsonProperty(value = "Tag6")
private String Tag6;
@JsonProperty(value = "Tag7")
private String Tag7;
@JsonProperty(value = "Tag8")
private String Tag8;
@JsonProperty(value = "Tag9")
private String Tag9;
@JsonProperty(value = "Tag10")
private String Tag10;
@JsonProperty(value = "tag1")
private String tag1;
@JsonProperty(value = "tag2")
private String tag2;
@JsonProperty(value = "tag3")
private String tag3;
@JsonProperty(value = "tag4")
private String tag4;
@JsonProperty(value = "tag5")
private String tag5;
@JsonProperty(value = "tag6")
private String tag6;
@JsonProperty(value = "tag7")
private String tag7;
@JsonProperty(value = "tag8")
private String tag8;
@JsonProperty(value = "tag9")
private String tag9;
@JsonProperty(value = "tag10")
private String tag10;
private String exeStatus;
}

40
project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java
View File

@@ -126,25 +126,25 @@ public class SpdmNewTaskVo extends BaseEntity {
*/
private Integer attentionFlag;
@JsonProperty(value = "Tag1")
private String Tag1;
@JsonProperty(value = "Tag2")
private String Tag2;
@JsonProperty(value = "Tag3")
private String Tag3;
@JsonProperty(value = "Tag4")
private String Tag4;
@JsonProperty(value = "Tag5")
private String Tag5;
@JsonProperty(value = "Tag6")
private String Tag6;
@JsonProperty(value = "Tag7")
private String Tag7;
@JsonProperty(value = "Tag8")
private String Tag8;
@JsonProperty(value = "Tag9")
private String Tag9;
@JsonProperty(value = "Tag10")
private String Tag10;
@JsonProperty(value = "tag1")
private String tag1;
@JsonProperty(value = "tag2")
private String tag2;
@JsonProperty(value = "tag3")
private String tag3;
@JsonProperty(value = "tag4")
private String tag4;
@JsonProperty(value = "tag5")
private String tag5;
@JsonProperty(value = "tag6")
private String tag6;
@JsonProperty(value = "tag7")
private String tag7;
@JsonProperty(value = "tag8")
private String tag8;
@JsonProperty(value = "tag9")
private String tag9;
@JsonProperty(value = "tag10")
private String tag10;
}

2
project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
View File

@@ -621,7 +621,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
String lastNodeId = "";
for (int i = 1; i <= 10; i++) {
try {
tagListProperty = getTagListProperty(taskNode, "Tag" + i);
tagListProperty = getTagListProperty(taskNode, "tag" + i);
if (CollectionUtils.isNotEmpty(tagListProperty)) {
lastNodeId = tagListProperty.get(tagListProperty.size() - 1);
}

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

@@ -504,61 +504,61 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
TaskNodeTag taskNodeTag = new TaskNodeTag();
String tag10 = projectNodePo.getTag10();
if (StringUtils.isNotBlank(tag10)) {
taskNodeTag.setKey("Tag10");
taskNodeTag.setKey("tag10");
taskNodeTag.setValue(tag10);
return taskNodeTag;
}
String tag9 = projectNodePo.getTag9();
if (StringUtils.isNotBlank(tag9)) {
taskNodeTag.setKey("Tag9");
taskNodeTag.setKey("tag9");
taskNodeTag.setValue(tag9);
return taskNodeTag;
}
String tag8 = projectNodePo.getTag8();
if (StringUtils.isNotBlank(tag8)) {
taskNodeTag.setKey("Tag8");
taskNodeTag.setKey("tag8");
taskNodeTag.setValue(tag8);
return taskNodeTag;
}
String tag7 = projectNodePo.getTag7();
if (StringUtils.isNotBlank(tag7)) {
taskNodeTag.setKey("Tag7");
taskNodeTag.setKey("tag7");
taskNodeTag.setValue(tag7);
return taskNodeTag;
}
String tag6 = projectNodePo.getTag6();
if (StringUtils.isNotBlank(tag6)) {
taskNodeTag.setKey("Tag6");
taskNodeTag.setKey("tag6");
taskNodeTag.setValue(tag6);
return taskNodeTag;
}
String tag5 = projectNodePo.getTag5();
if (StringUtils.isNotBlank(tag5)) {
taskNodeTag.setKey("Tag5");
taskNodeTag.setKey("tag5");
taskNodeTag.setValue(tag5);
return taskNodeTag;
}
String tag4 = projectNodePo.getTag4();
if (StringUtils.isNotBlank(tag4)) {
taskNodeTag.setKey("Tag4");
taskNodeTag.setKey("tag4");
taskNodeTag.setValue(tag4);
return taskNodeTag;
}
String tag3 = projectNodePo.getTag3();
if (StringUtils.isNotBlank(tag3)) {
taskNodeTag.setKey("Tag3");
taskNodeTag.setKey("tag3");
taskNodeTag.setValue(tag3);
return taskNodeTag;
}
String tag2 = projectNodePo.getTag2();
if (StringUtils.isNotBlank(tag2)) {
taskNodeTag.setKey("Tag2");
taskNodeTag.setKey("tag2");
taskNodeTag.setValue(tag2);
return taskNodeTag;
}
String tag1 = projectNodePo.getTag1();
if (StringUtils.isNotBlank(tag1)) {
taskNodeTag.setKey("Tag1");
taskNodeTag.setKey("tag1");
taskNodeTag.setValue(tag1);
}
return taskNodeTag;
@@ -684,7 +684,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag1List.contains(null)) {
tag1List = tag1List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag1".equals(taskNodeTag.getValue())) {
if ("tag1".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag1List)) {
tag1List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
@@ -698,7 +698,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag1".equals(taskNodeTag.getValue())) {
if ("tag1".equals(taskNodeTag.getValue())) {
tag1List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag1List)) {
projectNode.setTag1(new ArrayList<>(tag1List));
@@ -712,7 +712,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag2List.contains(null)) {
tag2List = tag2List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag2".equals(taskNodeTag.getValue())) {
if ("tag2".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag2List)) {
tag2List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
@@ -726,7 +726,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag2".equals(taskNodeTag.getValue())) {
if ("tag2".equals(taskNodeTag.getValue())) {
tag2List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag2List)) {
projectNode.setTag2(new ArrayList<>(tag2List));
@@ -740,7 +740,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag3List.contains(null)) {
tag3List = tag3List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag3".equals(taskNodeTag.getValue())) {
if ("tag3".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag3List)) {
tag3List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
@@ -754,7 +754,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag3".equals(taskNodeTag.getValue())) {
if ("tag3".equals(taskNodeTag.getValue())) {
tag3List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag3List)) {
projectNode.setTag3(new ArrayList<>(tag3List));
@@ -768,7 +768,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag4List.contains(null)) {
tag4List = tag4List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag4".equals(taskNodeTag.getValue())) {
if ("tag4".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag4List)) {
tag4List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
@@ -782,7 +782,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag4".equals(taskNodeTag.getValue())) {
if ("tag4".equals(taskNodeTag.getValue())) {
tag4List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag4List)) {
projectNode.setTag4(new ArrayList<>(tag4List));
@@ -797,7 +797,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag5List.contains(null)) {
tag5List = tag5List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag5".equals(taskNodeTag.getValue())) {
if ("tag5".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag5List)) {
tag5List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
@@ -811,7 +811,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag5".equals(taskNodeTag.getValue())) {
if ("tag5".equals(taskNodeTag.getValue())) {
tag5List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag5List)) {
projectNode.setTag5(new ArrayList<>(tag5List));
@@ -825,7 +825,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag6List.contains(null)) {
tag6List = tag6List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag6".equals(taskNodeTag.getValue())) {
if ("tag6".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag6List)) {
tag6List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
@@ -839,7 +839,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag6".equals(taskNodeTag.getValue())) {
if ("tag6".equals(taskNodeTag.getValue())) {
tag6List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag6List)) {
projectNode.setTag6(new ArrayList<>(tag6List));
@@ -853,7 +853,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag7List.contains(null)) {
tag7List = tag7List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag7".equals(taskNodeTag.getValue())) {
if ("tag7".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag7List)) {
tag7List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
@@ -867,7 +867,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag7".equals(taskNodeTag.getValue())) {
if ("tag7".equals(taskNodeTag.getValue())) {
tag7List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag7List)) {
projectNode.setTag7(new ArrayList<>(tag7List));
@@ -881,7 +881,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag8List.contains(null)) {
tag8List = tag8List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag8".equals(taskNodeTag.getValue())) {
if ("tag8".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag8List)) {
tag8List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
@@ -895,7 +895,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag8".equals(taskNodeTag.getValue())) {
if ("tag8".equals(taskNodeTag.getValue())) {
tag8List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag8List)) {
projectNode.setTag8(new ArrayList<>(tag8List));
@@ -909,7 +909,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag9List.contains(null)) {
tag9List = tag9List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag9".equals(taskNodeTag.getValue())) {
if ("tag9".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag9List)) {
tag9List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
@@ -923,7 +923,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag9".equals(taskNodeTag.getValue())) {
if ("tag9".equals(taskNodeTag.getValue())) {
tag9List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag9List)) {
projectNode.setTag9(new ArrayList<>(tag9List));
@@ -937,7 +937,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag10List.contains(null)) {
tag10List = tag10List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag10".equals(taskNodeTag.getValue())) {
if ("tag10".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag10List)) {
tag10List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
@@ -951,7 +951,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag10".equals(taskNodeTag.getValue())) {
if ("tag10".equals(taskNodeTag.getValue())) {
tag10List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag10List)) {
projectNode.setTag10(new ArrayList<>(tag10List));
@@ -1005,7 +1005,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag1List.contains(null)) {
tag1List = tag1List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag1".equals(taskNodeTag.getValue())) {
if ("tag1".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag1List)) {
tag1List.addAll(idMap.get(taskNodeTag.getKey()));
} else {
@@ -1019,7 +1019,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag1".equals(taskNodeTag.getValue())) {
if ("tag1".equals(taskNodeTag.getValue())) {
tag1List = idMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag1List)) {
projectNode.setTag1(new ArrayList<>(tag1List));
@@ -1033,7 +1033,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag2List.contains(null)) {
tag2List = tag2List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag2".equals(taskNodeTag.getValue())) {
if ("tag2".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag2List)) {
tag2List.addAll(idMap.get(taskNodeTag.getKey()));
} else {
@@ -1047,7 +1047,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag2".equals(taskNodeTag.getValue())) {
if ("tag2".equals(taskNodeTag.getValue())) {
tag2List = idMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag2List)) {
projectNode.setTag2(new ArrayList<>(tag2List));
@@ -1061,7 +1061,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag3List.contains(null)) {
tag3List = tag3List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag3".equals(taskNodeTag.getValue())) {
if ("tag3".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag3List)) {
tag3List.addAll(idMap.get(taskNodeTag.getKey()));
} else {
@@ -1075,7 +1075,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag3".equals(taskNodeTag.getValue())) {
if ("tag3".equals(taskNodeTag.getValue())) {
tag3List = idMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag3List)) {
projectNode.setTag3(new ArrayList<>(tag3List));
@@ -1089,7 +1089,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag4List.contains(null)) {
tag4List = tag4List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag4".equals(taskNodeTag.getValue())) {
if ("tag4".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag4List)) {
tag4List.addAll(idMap.get(taskNodeTag.getKey()));
} else {
@@ -1103,7 +1103,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag4".equals(taskNodeTag.getValue())) {
if ("tag4".equals(taskNodeTag.getValue())) {
tag4List = idMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag4List)) {
projectNode.setTag4(new ArrayList<>(tag4List));
@@ -1117,7 +1117,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag5List.contains(null)) {
tag5List = tag5List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag5".equals(taskNodeTag.getValue())) {
if ("tag5".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag5List)) {
tag5List.addAll(idMap.get(taskNodeTag.getKey()));
} else {
@@ -1131,7 +1131,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag5".equals(taskNodeTag.getValue())) {
if ("tag5".equals(taskNodeTag.getValue())) {
tag5List = idMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag5List)) {
projectNode.setTag5(new ArrayList<>(tag5List));
@@ -1145,7 +1145,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag6List.contains(null)) {
tag6List = tag6List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag6".equals(taskNodeTag.getValue())) {
if ("tag6".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag6List)) {
tag6List.addAll(idMap.get(taskNodeTag.getKey()));
} else {
@@ -1159,7 +1159,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag6".equals(taskNodeTag.getValue())) {
if ("tag6".equals(taskNodeTag.getValue())) {
tag6List = idMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag6List)) {
projectNode.setTag6(new ArrayList<>(tag6List));
@@ -1173,7 +1173,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag7List.contains(null)) {
tag7List = tag7List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag7".equals(taskNodeTag.getValue())) {
if ("tag7".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag7List)) {
tag7List.addAll(idMap.get(taskNodeTag.getKey()));
} else {
@@ -1187,7 +1187,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag7".equals(taskNodeTag.getValue())) {
if ("tag7".equals(taskNodeTag.getValue())) {
tag7List = idMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag7List)) {
projectNode.setTag7(new ArrayList<>(tag7List));
@@ -1201,7 +1201,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag8List.contains(null)) {
tag8List = tag8List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag8".equals(taskNodeTag.getValue())) {
if ("tag8".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag8List)) {
tag8List.addAll(idMap.get(taskNodeTag.getKey()));
} else {
@@ -1215,7 +1215,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag8".equals(taskNodeTag.getValue())) {
if ("tag8".equals(taskNodeTag.getValue())) {
tag8List = idMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag8List)) {
projectNode.setTag8(new ArrayList<>(tag8List));
@@ -1229,7 +1229,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag9List.contains(null)) {
tag9List = tag9List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag9".equals(taskNodeTag.getValue())) {
if ("tag9".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag9List)) {
tag9List.addAll(idMap.get(taskNodeTag.getKey()));
} else {
@@ -1243,7 +1243,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag9".equals(taskNodeTag.getValue())) {
if ("tag9".equals(taskNodeTag.getValue())) {
tag9List = idMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag9List)) {
projectNode.setTag9(new ArrayList<>(tag9List));
@@ -1257,7 +1257,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (tag10List.contains(null)) {
tag10List = tag10List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag10".equals(taskNodeTag.getValue())) {
if ("tag10".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag10List)) {
tag10List.addAll(idMap.get(taskNodeTag.getKey()));
} else {
@@ -1271,7 +1271,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("Tag10".equals(taskNodeTag.getValue())) {
if ("tag10".equals(taskNodeTag.getValue())) {
tag10List = idMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag10List)) {
projectNode.setTag10(new ArrayList<>(tag10List));

20
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -297,61 +297,61 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
TaskNodeTag taskNodeTag = new TaskNodeTag();
String tag10 = projectNodePo.getTag10();
if (StringUtils.isNotBlank(tag10)) {
taskNodeTag.setKey("Tag10");
taskNodeTag.setKey("tag10");
taskNodeTag.setValue(tag10);
return taskNodeTag;
}
String tag9 = projectNodePo.getTag9();
if (StringUtils.isNotBlank(tag9)) {
taskNodeTag.setKey("Tag9");
taskNodeTag.setKey("tag9");
taskNodeTag.setValue(tag9);
return taskNodeTag;
}
String tag8 = projectNodePo.getTag8();
if (StringUtils.isNotBlank(tag8)) {
taskNodeTag.setKey("Tag8");
taskNodeTag.setKey("tag8");
taskNodeTag.setValue(tag8);
return taskNodeTag;
}
String tag7 = projectNodePo.getTag7();
if (StringUtils.isNotBlank(tag7)) {
taskNodeTag.setKey("Tag7");
taskNodeTag.setKey("tag7");
taskNodeTag.setValue(tag7);
return taskNodeTag;
}
String tag6 = projectNodePo.getTag6();
if (StringUtils.isNotBlank(tag6)) {
taskNodeTag.setKey("Tag6");
taskNodeTag.setKey("tag6");
taskNodeTag.setValue(tag6);
return taskNodeTag;
}
String tag5 = projectNodePo.getTag5();
if (StringUtils.isNotBlank(tag5)) {
taskNodeTag.setKey("Tag5");
taskNodeTag.setKey("tag5");
taskNodeTag.setValue(tag5);
return taskNodeTag;
}
String tag4 = projectNodePo.getTag4();
if (StringUtils.isNotBlank(tag4)) {
taskNodeTag.setKey("Tag4");
taskNodeTag.setKey("tag4");
taskNodeTag.setValue(tag4);
return taskNodeTag;
}
String tag3 = projectNodePo.getTag3();
if (StringUtils.isNotBlank(tag3)) {
taskNodeTag.setKey("Tag3");
taskNodeTag.setKey("tag3");
taskNodeTag.setValue(tag3);
return taskNodeTag;
}
String tag2 = projectNodePo.getTag2();
if (StringUtils.isNotBlank(tag2)) {
taskNodeTag.setKey("Tag2");
taskNodeTag.setKey("tag2");
taskNodeTag.setValue(tag2);
return taskNodeTag;
}
String tag1 = projectNodePo.getTag1();
if (StringUtils.isNotBlank(tag1)) {
taskNodeTag.setKey("Tag1");
taskNodeTag.setKey("tag1");
taskNodeTag.setValue(tag1);
}
return taskNodeTag;

4
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -121,7 +121,7 @@ public class TaskServiceImpl implements ITaskService {
String currentNodeTagId = "";
for (SpdmTaskVo spdmTaskVo : allTaskList) {
try {
currentNodeTagId = getTagProperty(spdmTaskVo, realTaskNodeTag.getValue().replace("T", "t"));
currentNodeTagId = getTagProperty(spdmTaskVo, realTaskNodeTag.getValue());
if (StringUtils.isNotBlank(currentNodeTagId) && currentNodeTagId.contains(realTaskNodeTag.getKey())) {
taskList.add(spdmTaskVo);
}
@@ -199,7 +199,7 @@ public class TaskServiceImpl implements ITaskService {
for (SpdmTaskVo spdmTaskVo : taskList) {
for (String tag : tagList) {
try {
eachNodeId = getTagProperty(spdmTaskVo, tag.replace("T", "t"));
eachNodeId = getTagProperty(spdmTaskVo, tag);
if (StringUtils.isNotBlank(eachNodeId)) {
eachNodeIdList = Arrays.stream(eachNodeId.split(",")).filter(nodeId -> !nodeId.equals("null")).toList();
if (CollectionUtils.isNotEmpty(eachNodeIdList)) {

4
project/src/main/resources/mapper/SimulationNodeMapper.xml
View File

@@ -12,8 +12,8 @@
<foreach collection='addNodeList' item='addNode' index='index' separator=','>
(#{addNode.uuid},#{addNode.ownRootNodeUuid},#{addNode.nodeName},#{addNode.nodeCode},'',#{addNode.nodeType},#{addNode.nodeSubType},'0',#{addNode.pid},
'',1,#{addNode.beginTime},#{addNode.endTime},'',#{addNode.progressStatus},#{addNode.achieveStatus},'1',#{addNode.tenantId},#{addNode.description},
#{addNode.detailImgUrl},#{addNode.creator},#{addNode.createTime},#{addNode.Tag1},#{addNode.Tag2},
#{addNode.Tag3},#{addNode.Tag4},#{addNode.Tag5},#{addNode.Tag6},#{addNode.Tag7},#{addNode.Tag8},#{addNode.Tag9},#{addNode.Tag10})
#{addNode.detailImgUrl},#{addNode.creator},#{addNode.createTime},#{addNode.tag1},#{addNode.tag2},
#{addNode.tag3},#{addNode.tag4},#{addNode.tag5},#{addNode.tag6},#{addNode.tag7},#{addNode.tag8},#{addNode.tag9},#{addNode.tag10})
</foreach>
</insert>

100
project/src/main/resources/mapper/SimulationProjectMapper.xml
View File

@@ -10,11 +10,11 @@
<foreach collection='list' item='addNode' index='index' separator=','>
(#{addNode.uuid},#{addNode.ownRootNodeUuid},#{addNode.nodeName},#{addNode.nodeCode},#{addNode.englishName},#{addNode.nodeType},#{addNode.nodeSubType},'0',#{addNode.parentId},
'',1,#{addNode.beginTime},#{addNode.endTime},'',1,#{addNode.achieveStatus},'1',#{addNode.tenantId},#{addNode.description},
#{addNode.detailImgUrl},#{addNode.creator},#{addNode.createTime},#{addNode.Tag1,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{addNode.Tag2,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{addNode.Tag3,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{addNode.Tag4,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{addNode.Tag5,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{addNode.Tag6,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{addNode.Tag7,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{addNode.Tag8,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{addNode.Tag9,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{addNode.Tag10,typeHandler=com.sdm.project.handler.ListStringTypeHandler})
#{addNode.detailImgUrl},#{addNode.creator},#{addNode.createTime},#{addNode.tag1,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{addNode.tag2,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{addNode.tag3,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{addNode.tag4,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{addNode.tag5,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{addNode.tag6,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{addNode.tag7,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{addNode.tag8,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{addNode.tag9,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{addNode.tag10,typeHandler=com.sdm.project.handler.ListStringTypeHandler})
</foreach>
</insert>
@@ -39,11 +39,11 @@
<foreach collection='list' item='it' index='index' separator=','>
(#{it.uuid},#{it.taskName},#{it.taskCode},'','',#{it.nodeId},#{it.days},#{it.standard},'',1,0,
#{it.beginTime},#{it.endTime},0,1,#{it.confidence},#{it.analyseTarget},#{it.analyseSoftwares},#{it.description},#{it.difficult},#{it.tenantId},
#{it.creator},#{it.createTime},#{it.department},#{it.section},#{it.group},#{it.bCapacity},#{it.flowTemplateName},#{it.englishName},#{it.demandId},#{it.Tag1,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.Tag2,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.Tag3,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.Tag4,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.Tag5,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.Tag6,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.Tag7,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.Tag8,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.Tag9,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.Tag10,typeHandler=com.sdm.project.handler.ListStringTypeHandler})
#{it.creator},#{it.createTime},#{it.department},#{it.section},#{it.group},#{it.bCapacity},#{it.flowTemplateName},#{it.englishName},#{it.demandId},#{it.tag1,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag2,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.tag3,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag4,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.tag5,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag6,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.tag7,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag8,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.tag9,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag10,typeHandler=com.sdm.project.handler.ListStringTypeHandler})
</foreach>
</insert>
@@ -569,35 +569,35 @@
<select id="getNodeListByTag" resultType="com.sdm.project.model.po.ProjectNodePo">
select * from simulation_node
<where>
<if test="req.Tag1 != null and req.Tag1 != ''">
tag1 = #{req.Tag1}
<if test="req.tag1 != null and req.tag1 != ''">
tag1 = #{req.tag1}
</if>
<if test="req.Tag2 != null and req.Tag2 != ''">
and tag2 = #{req.Tag2}
<if test="req.tag2 != null and req.tag2 != ''">
and tag2 = #{req.tag2}
</if>
<if test="req.Tag3 != null and req.Tag3 != ''">
and tag3 = #{req.Tag3}
<if test="req.tag3 != null and req.tag3 != ''">
and tag3 = #{req.tag3}
</if>
<if test="req.Tag4 != null and req.Tag4 != ''">
and tag4 = #{req.Tag4}
<if test="req.tag4 != null and req.tag4 != ''">
and tag4 = #{req.tag4}
</if>
<if test="req.Tag5 != null and req.Tag5 != ''">
and tag5 = #{req.Tag5}
<if test="req.tag5 != null and req.tag5 != ''">
and tag5 = #{req.tag5}
</if>
<if test="req.Tag6 != null and req.Tag6 != ''">
and tag6 = #{req.Tag6}
<if test="req.tag6 != null and req.tag6 != ''">
and tag6 = #{req.tag6}
</if>
<if test="req.Tag7 != null and req.Tag7 != ''">
and tag7 = #{req.Tag7}
<if test="req.tag7 != null and req.tag7 != ''">
and tag7 = #{req.tag7}
</if>
<if test="req.Tag8 != null and req.Tag8 != ''">
and tag8 = #{req.Tag8}
<if test="req.tag8 != null and req.tag8 != ''">
and tag8 = #{req.tag8}
</if>
<if test="req.Tag9 != null and req.Tag9 != ''">
and tag9 = #{req.Tag9}
<if test="req.tag9 != null and req.tag9 != ''">
and tag9 = #{req.tag9}
</if>
<if test="req.Tag10 != null and req.Tag10 != ''">
and tag10 = #{req.Tag10}
<if test="req.tag10 != null and req.tag10 != ''">
and tag10 = #{req.tag10}
</if>
</where>
</select>
@@ -605,35 +605,35 @@
<select id="getTaskListByTag" resultType="com.sdm.project.model.po.TaskNodePo">
select * from simulation_task
<where>
<if test="req.Tag1 != null and req.Tag1 != ''">
tag1 like CONCAT('%',#{req.Tag1},'%')
<if test="req.tag1 != null and req.tag1 != ''">
tag1 like CONCAT('%',#{req.tag1},'%')
</if>
<if test="req.Tag2 != null and req.Tag2 != ''">
and tag2 like CONCAT('%',#{req.Tag2},'%')
<if test="req.tag2 != null and req.tag2 != ''">
and tag2 like CONCAT('%',#{req.tag2},'%')
</if>
<if test="req.Tag3 != null and req.Tag3 != ''">
and tag3 like CONCAT('%',#{req.Tag3},'%')
<if test="req.tag3 != null and req.tag3 != ''">
and tag3 like CONCAT('%',#{req.tag3},'%')
</if>
<if test="req.Tag4 != null and req.Tag4 != ''">
and tag4 like CONCAT('%',#{req.Tag4},'%')
<if test="req.tag4 != null and req.tag4 != ''">
and tag4 like CONCAT('%',#{req.tag4},'%')
</if>
<if test="req.Tag5 != null and req.Tag5 != ''">
and tag5 like CONCAT('%',#{req.Tag5},'%')
<if test="req.tag5 != null and req.tag5 != ''">
and tag5 like CONCAT('%',#{req.tag5},'%')
</if>
<if test="req.Tag6 != null and req.Tag6 != ''">
and tag6 like CONCAT('%',#{req.Tag6},'%')
<if test="req.tag6 != null and req.tag6 != ''">
and tag6 like CONCAT('%',#{req.tag6},'%')
</if>
<if test="req.Tag7 != null and req.Tag7 != ''">
and tag7 like CONCAT('%',#{req.Tag7},'%')
<if test="req.tag7 != null and req.tag7 != ''">
and tag7 like CONCAT('%',#{req.tag7},'%')
</if>
<if test="req.Tag8 != null and req.Tag8 != ''">
and tag8 like CONCAT('%',#{req.Tag8},'%')
<if test="req.tag8 != null and req.tag8 != ''">
and tag8 like CONCAT('%',#{req.tag8},'%')
</if>
<if test="req.Tag9 != null and req.Tag9 != ''">
and tag9 like CONCAT('%',#{req.Tag9},'%')
<if test="req.tag9 != null and req.tag9 != ''">
and tag9 like CONCAT('%',#{req.tag9},'%')
</if>
<if test="req.Tag10 != null and req.Tag10 != ''">
and tag10 like CONCAT('%',#{req.Tag10},'%')
<if test="req.tag10 != null and req.tag10 != ''">
and tag10 like CONCAT('%',#{req.tag10},'%')
</if>
</where>
</select>