|
|
@@ -196,7 +196,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
|
|
|
.eq(StrUtil.isNotBlank(vo.getStatus()), SampleInfo::getStatus, vo.getStatus())
|
|
|
.eq(Objects.nonNull(vo.getApplicantId()), SampleInfo::getApplicantId, vo.getApplicantId())
|
|
|
.eq(SampleInfo::getDeleted, YesNoEnum.NO.getCode())
|
|
|
- .orderByDesc(SampleInfo::getCreateTime);
|
|
|
+ .orderByDesc(SampleInfo::getApplyTime, SampleInfo::getCreateTime);
|
|
|
if (StrUtil.isNotBlank(vo.getProject())) {
|
|
|
wrapper.and(i -> i.like(SampleInfo::getProjectNo, vo.getProject()).or()
|
|
|
.like(SampleInfo::getProjectName, vo.getProject()));
|