Merge branch 'uat-examination' into 'uat'

Uat examination

See merge request eshop/biz_service_ebtp_project!52
This commit is contained in:
付庆吉
2022-05-19 10:52:37 +08:00
2 changed files with 5 additions and 0 deletions

View File

@ -116,6 +116,7 @@ public class BizProjectNotificationServiceImpl extends BaseServiceImpl<BizProjec
.ne("a.status", "d")
.like(StringUtils.isNotBlank(projectRecord.getProjectName()), "b.project_name", projectRecord.getProjectName())
.eq(StringUtils.isNotBlank(projectRecord.getBidMethodDict()), "b.bid_method_dict", projectRecord.getBidMethodDict())
.eq(StringUtils.isNotBlank(projectRecord.getIsPublic()), "b.is_public", projectRecord.getIsPublic())
.orderByDesc("a.create_date");
IPage<ProjectRecordVO> page = projectNotificationMapper.getPageBySupervisor(
new Page<>(projectRecord.getBasePageRequest().getPageNo(), projectRecord.getBasePageRequest().getPageSize()),

View File

@ -195,6 +195,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
query.eq("is_public", projectRecordVO.getIsPublic());
}
if(StringUtils.isNotBlank(projectRecordVO.getEbpProjectNumber())){
query.eq("ebp_project_number", projectRecordVO.getEbpProjectNumber());
}
if(null != projectRecordVO.getLimit()){
query.last("limit "+ projectRecordVO.getLimit());
}