|
|
@@ -69,6 +69,7 @@ import com.hz.pm.api.projectlib.model.enumeration.ProjectRenewalApprovalStatusEn |
|
|
|
import com.hz.pm.api.projectlib.model.enumeration.status.ProjectStatus; |
|
|
|
import com.hz.pm.api.projectlib.model.enumeration.status.TenderMainStatus; |
|
|
|
import com.hz.pm.api.projectlib.model.po.ProjectPO; |
|
|
|
import com.hz.pm.api.projectlib.model.req.BindSystemToBidReq; |
|
|
|
import com.hz.pm.api.projectlib.model.req.ProjectApplicationListReq; |
|
|
|
import com.hz.pm.api.projectlib.model.req.ProjectListReq; |
|
|
|
import com.hz.pm.api.projectlib.model.vo.*; |
|
|
@@ -140,7 +141,7 @@ public class ProjectLibManage { |
|
|
|
private final UserInfoHelper userInfoHelper; |
|
|
|
private final IExpertReviewService expertReviewService; |
|
|
|
private final ConstructionManage constructionManage; |
|
|
|
private final IProjectGovSystemReplaceInfosService projectGovSystemReplaceInfosService; |
|
|
|
private final IProjectGovSystemReplaceInfosService systemReplaceInfosService; |
|
|
|
private final MhUnitCache mhUnitCache; |
|
|
|
private final IMhProjectSchemaTargetDataService projectSchemaTargetDataService; |
|
|
|
private final IMhProjectService mhProjectService; |
|
|
@@ -680,7 +681,7 @@ public class ProjectLibManage { |
|
|
|
.eq(ProjectGovSystemReplaceInfos::getProjectId, projectId) |
|
|
|
.orderByAsc(ProjectGovSystemReplaceInfos::getId) |
|
|
|
.orderByAsc(ProjectGovSystemReplaceInfos::getBatchNo); |
|
|
|
List<ProjectGovSystemReplaceInfos> govSystemReplaceInfos = projectGovSystemReplaceInfosService.list(query); |
|
|
|
List<ProjectGovSystemReplaceInfos> govSystemReplaceInfos = systemReplaceInfosService.list(query); |
|
|
|
if (govSystemReplaceInfos.isEmpty()) { |
|
|
|
return Collections.emptyList(); |
|
|
|
} |
|
|
@@ -773,7 +774,7 @@ public class ProjectLibManage { |
|
|
|
|
|
|
|
//查询初验信息 |
|
|
|
Map<Long, List<PreInsAcceptancePerson>> acceptPersonsMap = acceptancePersonService.listByBidIds(purchaseMap.keySet()); |
|
|
|
List<ProjectGovSystemReplaceInfos> systemReplaceInfos = projectGovSystemReplaceInfosService.listByBidIds(purchaseMap.keySet()); |
|
|
|
List<ProjectGovSystemReplaceInfos> systemReplaceInfos = systemReplaceInfosService.listByBidIds(purchaseMap.keySet()); |
|
|
|
Map<Long, List<ProjectGovSystemReplaceInfos>> replaceInfosMap = CollUtils.group(systemReplaceInfos, ProjectGovSystemReplaceInfos::getBidId); |
|
|
|
purchaseMap.forEach((k, v) -> { |
|
|
|
PurchaseFullInfoVO purchaseFullInfo = new PurchaseFullInfoVO(); |
|
|
@@ -1199,7 +1200,7 @@ public class ProjectLibManage { |
|
|
|
} |
|
|
|
|
|
|
|
public List<ProjectGovSystemReplaceInfos> getSystemReplaceInfosOption(String projectCode) { |
|
|
|
return projectGovSystemReplaceInfosService.listByProjectCode(projectCode); |
|
|
|
return systemReplaceInfosService.listByProjectCode(projectCode); |
|
|
|
} |
|
|
|
|
|
|
|
public List<ProcessDetailVO> processScheduleDetail(Long projectId) { |
|
|
@@ -1494,5 +1495,32 @@ public class ProjectLibManage { |
|
|
|
return res; |
|
|
|
} |
|
|
|
|
|
|
|
public synchronized void bindSystemToBid(BindSystemToBidReq req) { |
|
|
|
List<ProjectGovSystemReplaceInfos> replaceInfos = systemReplaceInfosService.listByIds(req.getSystemReplaceInfoIds()); |
|
|
|
if (replaceInfos.isEmpty()) { |
|
|
|
throw ReturnException.wrap("系统替换信息不存在"); |
|
|
|
} |
|
|
|
replaceInfos.removeIf(w -> req.getBidId().equals(w.getBidId())); |
|
|
|
if (!replaceInfos.isEmpty()) { |
|
|
|
replaceInfos.forEach(w -> { |
|
|
|
if (w.getBidId() != null) { |
|
|
|
throw ReturnException.wrap("已关联其他标项"); |
|
|
|
} |
|
|
|
w.setBidId(req.getBidId()); |
|
|
|
}); |
|
|
|
systemReplaceInfosService.updateBatchById(replaceInfos); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public void cancelSystemFromBid(BindSystemToBidReq req) { |
|
|
|
List<ProjectGovSystemReplaceInfos> replaceInfos = systemReplaceInfosService.listByIds(req.getSystemReplaceInfoIds()); |
|
|
|
if (replaceInfos.isEmpty()) { |
|
|
|
throw ReturnException.wrap("系统替换信息不存在"); |
|
|
|
} |
|
|
|
Wrapper<ProjectGovSystemReplaceInfos> wrapper = Wrappers.lambdaUpdate(ProjectGovSystemReplaceInfos.class) |
|
|
|
.set(ProjectGovSystemReplaceInfos::getBidId, null) |
|
|
|
.in(ProjectGovSystemReplaceInfos::getId, req.getSystemReplaceInfoIds()); |
|
|
|
systemReplaceInfosService.update(wrapper); |
|
|
|
} |
|
|
|
|
|
|
|
} |