liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目列表查询bug修改

Browse Source
This commit is contained in:
dxc
2021-04-20 14:13:12 +08:00
parent 7b1745ab01
commit cb87be5333
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java
View File

@ -111,14 +111,14 @@ public interface IProjectRecordService extends IBaseService<ProjectRecord>{
/**
* 获取项目是否可以修改
* @param id 项目ID
* @return
* @return 返回结果
*/
boolean getProjectIsUpdate(String id);
/**
* 自主采购直接初始化信息
* @param projectEntrustVO 自主采购信息
* @return
* @return 返回结果
*/
boolean initProjectByIndependentProcurement(ProjectEntrustVO projectEntrustVO);
@ -137,12 +137,17 @@ public interface IProjectRecordService extends IBaseService<ProjectRecord>{
*/
void inquiryInitialize(String id, Map<String, String> sectionMaps, LocalDateTime reviewStartTime);
/**
* 查询询价项目信息
* @param inquiryId 询价id
* @return 返回结果
*/
ProjectRecord getByInquiryId(String inquiryId);
/**
* 获取
* @param id
* @return
* @param id 项目ID
* @return 返回结果
*/
BigDecimal getBudgetAmountById(String id);
@ -153,11 +158,16 @@ public interface IProjectRecordService extends IBaseService<ProjectRecord>{
*/
IPage<ProjectRecordVO> getPageByPurchase(ProjectRecordVO projectRecord);
/**
* 获取归档标段状态信息
* @param sectionVOList 标段集合
*/
void getArchiveStatus(List<ProjectSectionVO> sectionVOList);
/**
* 获取标段信息进度比
* @param sectionVO 标段环节
* @param vo 项目信息
* @return 返回结果
*/
void getLinkPercentage(ProjectSectionVO sectionVO, ProjectRecordVO vo);
}

19
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
View File

@ -1044,13 +1044,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
}
//拼装归档状态 是否进行归档
List<String> archiveSectionIds = sectionVOList.stream().filter(n -> n.getBusinessModule() == ProjectCommonUtil.BUSINESS_MODULE_12).map(ProjectSection::getId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(archiveSectionIds)){
BaseResponse<Map<String,Integer>> response = archiveApi.getArchiveStatusBySectionIds(archiveSectionIds);
CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess());
Map<String,Integer> resultMap = response.getData();
sectionVOList.forEach(n -> n.setArchiveStatus(resultMap.get(n.getId())));
}
getArchiveStatus(sectionVOList);
//拼装查询报名人数 当前进度
List<String> sectionIds = sectionVOList.stream().map(ProjectSection::getId).collect(Collectors.toList());
@ -1073,6 +1067,17 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
}
}
@Override
public void getArchiveStatus(List<ProjectSectionVO> sectionVOList) {
List<String> archiveSectionIds = sectionVOList.stream().filter(n -> n.getBusinessModule() == ProjectCommonUtil.BUSINESS_MODULE_12).map(ProjectSection::getId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(archiveSectionIds)){
BaseResponse<Map<String,Integer>> response = archiveApi.getArchiveStatusBySectionIds(archiveSectionIds);
CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess());
Map<String,Integer> resultMap = response.getData();
sectionVOList.forEach(n -> n.setArchiveStatus(resultMap.get(n.getId())));
}
}
@Override
public void getLinkPercentage(ProjectSectionVO sectionVO, ProjectRecordVO vo){
boolean isReviewMethod = this.isReviewMethod(vo);

4
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
View File

@ -511,6 +511,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
queryWrapper.eq(ProjectSection::getProjectId,projectId);
queryWrapper.orderByAsc(ProjectSection::getBidSectCode);
List<ProjectSection> sectionList = this.list(queryWrapper);
List<String> sectionIds = sectionList.stream().map(ProjectSection::getId).collect(Collectors.toList());
BaseResponse<Map<String,Long>> response = tenderApi.getRegisterCountByPackage(sectionIds);
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess());
@ -524,6 +525,9 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
recordService.getLinkPercentage(vo,BeanUtil.toBean(record, ProjectRecordVO.class));
resultList.add(vo);
}
//拼装归档状态 是否进行归档
recordService.getArchiveStatus(resultList);
return resultList;
}