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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gulongcheng
2026-03-04 10:05:23 +08:00
parent 0e1f2d2b86 c1fa22405c
commit d8cd8d4c4c
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
project/src/main/java/com/sdm/project/model/vo/SpdmDemandVo.java
View File

@@ -183,4 +183,9 @@ public class SpdmDemandVo extends BaseEntity {
*/
private List<Long> demandFileIds;
/**
* 产品线（利元亨定制）
*/
private String productionLine;
}

2
project/src/main/java/com/sdm/project/service/handle/LyricQueryDemandFileHandler.java
View File

@@ -53,7 +53,7 @@ public class LyricQueryDemandFileHandler implements IQueryDemandFileHandler {
}
SimulationDemand demand = lyricDemandService.lambdaQuery().eq(SimulationDemand::getUuid, req.getUuid()).one();
if (demand != null) {
if (demand != null && StringUtils.isNotBlank(demand.getDemandCode())) {
// 2、再调用利元亨查询待办接口
SdmResponse sdmResponse = lyricIntegrateService.queryTodoAttachments(Integer.valueOf(demand.getDemandCode()));
if (sdmResponse.isSuccess() && sdmResponse.getData() != null) {

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

@@ -59,6 +59,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import static com.sdm.project.service.impl.LyricInternalServiceImpl.PRODUCE_LINE;
import static com.sdm.project.service.impl.NodeServiceImpl.getTagListProperty;
@Slf4j
@@ -1199,6 +1200,22 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
}
spdmDemandVo.setAMemberList(spdmAUserVoList);
}
// 利元亨定制，设置产品线（在节点拓展属性里）
if (StringUtils.isBlank(projectId)) {
log.info("项目id为空，无法查询产品线");
}else {
List<SpdmNodeExtraVo> nodeExtraList = nodeMapper.getNodeExtraListByNodeIdList(Collections.singletonList(projectId));
if (CollectionUtils.isEmpty(nodeExtraList)) {
log.info("项目拓展属性为空，无法查询产品线");
}else {
SpdmNodeExtraVo spdmNodeExtraVo = nodeExtraList.stream().filter(nodeExtra -> PRODUCE_LINE.equals(nodeExtra.getPropertyName())).findFirst().orElse(null);
if (spdmNodeExtraVo == null) {
log.info("项目拓展属性中没有产品线数据");
}else {
spdmDemandVo.setProductionLine(spdmNodeExtraVo.getPropertyValue());
}
}
}
return SdmResponse.success(spdmDemandVo);
}

18
project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
View File

@@ -102,15 +102,15 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
private static final int UUID_LENGTH = 32;
private static final String PROJECT_STAGE = "PROJECT_STAGE";
private static final String SELF_DEVELOP = "self_develop";
private static final String DOMAIN = "domain";
private static final String CLIENT_NAME = "clientName";
private static final String DIFFICULT_TYPE = "difficultType";
private static final String PROGRAM_MANAGER = "programManager";
private static final String PROCESS_SECTION = "processSection";
private static final String PRODUCE_LINE = "produceLine";
private static final String PROGRAM_TEAM = "programTeam";
private static final String REFERENCE_ITEM = "referenceItem";
private static final String PROJECT_UNDERTAKER = "projectUndertaker";
public static final String DOMAIN = "domain";
public static final String CLIENT_NAME = "clientName";
public static final String DIFFICULT_TYPE = "difficultType";
public static final String PROGRAM_MANAGER = "programManager";
public static final String PROCESS_SECTION = "processSection";
public static final String PRODUCE_LINE = "produceLine";
public static final String PROGRAM_TEAM = "programTeam";
public static final String REFERENCE_ITEM = "referenceItem";
public static final String PROJECT_UNDERTAKER = "projectUndertaker";
// 同步待办锁
private final ReentrantLock syncTodoInfoLock = new ReentrantLock();