fix: ASW-111 job startTimestamp,endTimeStamp 没有设置值时,返回 null
This commit is contained in:
@@ -64,6 +64,13 @@ public class JobServiceImpl extends ServiceImpl<JobDao, JobEntity> implements IJ
|
||||
|
||||
PackageEntity pkg = packageService.getById(job.getPackageId());
|
||||
job.setPkg(pkg);
|
||||
|
||||
if (-1 == job.getStartTimestamp()) {
|
||||
job.setStartTimestamp(null);
|
||||
}
|
||||
if (-1 == job.getEndTimestamp()) {
|
||||
job.setEndTimestamp(null);
|
||||
}
|
||||
return job;
|
||||
}
|
||||
|
||||
@@ -71,6 +78,14 @@ public class JobServiceImpl extends ServiceImpl<JobDao, JobEntity> implements IJ
|
||||
public Page queryList(Map<String, Object> params) {
|
||||
Page page = new Query(JobEntity.class).getPage(params);
|
||||
List<JobEntity> jobList = this.getBaseMapper().queryList(page, params);
|
||||
jobList.stream().forEach(jobEntity -> {
|
||||
if (-1 == jobEntity.getStartTimestamp()) {
|
||||
jobEntity.setStartTimestamp(null);
|
||||
}
|
||||
if (-1 == jobEntity.getEndTimestamp()) {
|
||||
jobEntity.setEndTimestamp(null);
|
||||
}
|
||||
});
|
||||
page.setRecords(jobList);
|
||||
return page;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user