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

Compare commits

base: toolchaintechnologycenter:b982eb80d211bd7db0f0050ac51c770583ad99c4
Branches Tags
toolchaintechnologycenter:main toolchaintechnologycenter:dev-glc toolchaintechnologycenter:bug_fix
toolchaintechnologycenter:V20260417 toolchaintechnologycenter:V20260402-2 toolchaintechnologycenter:V20260402 toolchaintechnologycenter:V20260331 toolchaintechnologycenter:V20260327 toolchaintechnologycenter:V20260326 toolchaintechnologycenter:V20260325 toolchaintechnologycenter:202603241700版本 toolchaintechnologycenter:202603231700版本
...
compare: toolchaintechnologycenter:c6df7bb341cad8d8e21237e899d3458467b7c5fb
Branches Tags
toolchaintechnologycenter:main toolchaintechnologycenter:dev-glc toolchaintechnologycenter:bug_fix
toolchaintechnologycenter:V20260417 toolchaintechnologycenter:V20260402-2 toolchaintechnologycenter:V20260402 toolchaintechnologycenter:V20260331 toolchaintechnologycenter:V20260327 toolchaintechnologycenter:V20260326 toolchaintechnologycenter:V20260325 toolchaintechnologycenter:202603241700版本 toolchaintechnologycenter:202603231700版本

2 Commits
b982eb80d2 ... c6df7bb341

Author SHA1 Message Date
lidongyang
c6df7bb341 Merge branch 'main' of http://192.168.65.198:3000/toolchaintechnologycenter/spdm-backend 2026-04-01 18:00:05 +08:00
lidongyang
e6e9335bc2 fix[project]: 只在当前项目下进行校验需求名是否同名 2026-04-01 17:59:56 +08:00
3 changed files with 9 additions and 6 deletions
Expand all files Collapse all files

2
project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java
View File

@@ -35,7 +35,7 @@ public interface SimulationDemandMapper extends BaseMapper<SimulationDemand> {
SpdmDemandVo getDemandByName(@Param("tenantId") Long tenantId,@Param("demandName") String demandName,@Param("projectId") String projectId);
SpdmDemandVo getDemandByNameNoPermission(@Param("tenantId") Long tenantId,@Param("demandName") String demandName);
SpdmDemandVo getDemandByNameNoPermission(@Param("tenantId") Long tenantId,@Param("demandName") String demandName,@Param("projectId") String projectId);
List<SpdmDemandExtraVo> getDemandExtraList(@Param("demandIdList") List<String> demandIdList);

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

@@ -1663,7 +1663,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
req.setCreateTime(curDateStr);
req.setUuid(RandomUtil.generateString(32));
SpdmDemandVo demandByName = mapper.getDemandByNameNoPermission(tenantId,req.getDemandName());
SpdmDemandVo demandByName = mapper.getDemandByNameNoPermission(tenantId, req.getDemandName(),req.getProjectId());
if (ObjectUtils.isNotEmpty(demandByName)) {
return SdmResponse.failed("需求名称：" + demandByName.getDemandName() + "已存在，请修改");
}

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

@@ -2645,10 +2645,13 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
log.info("addDemandByTask taskNodeList为：{}",taskNodeList);
for (TaskNode taskNode : taskNodeList) {
SpdmDemandVo demandByName = demandMapper.getDemandByNameNoPermission(tenantId,String.join(",", taskNode.getTag10()));
if (ObjectUtils.isNotEmpty(demandByName)) {
log.error("addDemandByTask 需求名称：{},已存在",demandByName.getDemandName());
continue;
List<String> projectIds = taskNode.getTag1();
if (CollectionUtils.isNotEmpty(projectIds)) {
SpdmDemandVo demandByName = demandMapper.getDemandByNameNoPermission(tenantId,String.join(",", taskNode.getTag10()),projectIds.get(0));
if (ObjectUtils.isNotEmpty(demandByName)) {
log.error("addDemandByTask 需求名称：{},已存在",demandByName.getDemandName());
continue;
}
}
SpdmAddDemandReq req = new SpdmAddDemandReq();
req.setCreator(jobNumber);