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

1、解决异常标段查询报错问题

Browse Source 
2、sonar相关问题修改
3、采购经理查询列表增加查询展示字段
This commit is contained in:
dxc
2021-04-09 11:18:50 +08:00
parent 7cc3d72819
commit e0ea9e5777
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecordVO.java
View File

@ -15,7 +15,6 @@ import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;

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

@ -467,16 +467,18 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
projectRecordVO.setBidOrgDict(ProjectCommonUtil.ORGANIZATION_1); projectRecordVO.setBidOrgDict(ProjectCommonUtil.ORGANIZATION_1);
projectRecordVO.setOwnerContactId(cacheUser.getUserId()); projectRecordVO.setOwnerContactId(cacheUser.getUserId());
QueryWrapper<ProjectRecord> query = getProjectRecordQueryWrapper(projectRecordVO); QueryWrapper<ProjectRecord> query = getProjectRecordQueryWrapper(projectRecordVO);
query.orderByDesc("create_date");
if(null == projectRecordVO.getBasePageRequest()){ if(null == projectRecordVO.getBasePageRequest()){
projectRecordVO.setBasePageRequest(new BasePageRequest()); projectRecordVO.setBasePageRequest(new BasePageRequest());
} }
query.orderByDesc("create_date");
//查询 //查询
IPage<ProjectRecord> p = new Page<>(projectRecordVO.getBasePageRequest().getPageNo(), projectRecordVO.getBasePageRequest().getPageSize()); IPage<ProjectRecord> p = new Page<>(projectRecordVO.getBasePageRequest().getPageNo(), projectRecordVO.getBasePageRequest().getPageSize());
IPage<ProjectRecord> result = this.page(p, query); IPage<ProjectRecord> result = this.page(p, query);
IPage<ProjectRecordVO> voPage = result.convert(c -> BeanUtil.toBean(c,ProjectRecordVO.class));
assembleProjectPage(voPage.getRecords());
return result.convert(c -> BeanUtil.toBean(c,ProjectRecordVO.class)); return voPage;
} }
@Override @Override

8
src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
View File

@ -187,12 +187,8 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
log.info("重评校验子项目信息请求参数 子项目ID：{}",section.getSubprojectId()); log.info("重评校验子项目信息请求参数 子项目ID：{}",section.getSubprojectId());
BaseResponse<Boolean> baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId())); BaseResponse<Boolean> baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId()));
log.info("重评校验子项目信息返回结果：{}",JsonUtils.objectToJson(baseResponse)); log.info("重评校验子项目信息返回结果：{}",JsonUtils.objectToJson(baseResponse));
if(!baseResponse.isSuccess()){ CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR.customValid(!baseResponse.getData());
}
if(!baseResponse.getData()){
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR.throwException();
}
}catch (Exception e){ }catch (Exception e){
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_CHECK_STATUS_ERROR.throwException(); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_CHECK_STATUS_ERROR.throwException();
} }

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

@ -482,16 +482,17 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
projectSection.setProjectId(projectId); projectSection.setProjectId(projectId);
projectSection.setStatus(ProjectCommonUtil.SECTION_STATUS_9); projectSection.setStatus(ProjectCommonUtil.SECTION_STATUS_9);
List<ProjectSectionVO> sectionVOList = projectSectionMapper.selectArchiveById(projectSection); List<ProjectSectionVO> sectionVOList = projectSectionMapper.selectArchiveById(projectSection);
List<String> sectionIds = sectionVOList.stream().map(n -> n.getId() + "_" + n.getRoomSort()).collect(Collectors.toList()); if(null != sectionVOList && !sectionVOList.isEmpty()){
List<String> sectionIds = sectionVOList.stream().map(n -> n.getId() + "_" + n.getRoomSort()).collect(Collectors.toList());
//调用归档信息查询是否已归档 //调用归档信息查询是否已归档
BaseResponse<Map<String,Boolean>> baseResponse = archiveApi.getArchiveSection(sectionIds); BaseResponse<Map<String,Boolean>> baseResponse = archiveApi.getArchiveSection(sectionIds);
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
Map<String,Boolean> archiveMap = baseResponse.getData(); Map<String,Boolean> archiveMap = baseResponse.getData();
sectionVOList = sectionVOList.stream().filter(n -> archiveMap.get(n.getId() + "_" +n.getRoomSort())).collect(Collectors.toList());
sectionVOList = sectionVOList.stream().filter(n -> archiveMap.get(n.getId() + "_" +n.getRoomSort())).collect(Collectors.toList());
}
return sectionVOList; return sectionVOList;
} }