|
@@ -14,6 +14,7 @@ package vip.xiaonuo.biz.modular.passenger.passengerinfo.service.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollStreamUtil;
|
|
|
+import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
@@ -50,6 +51,7 @@ import vip.xiaonuo.biz.modular.passenger.passengerinfo.mapper.PassengerInfoMappe
|
|
|
import vip.xiaonuo.biz.modular.passenger.passengerinfo.service.PassengerInfoService;
|
|
|
import vip.xiaonuo.common.util.CommonIdCardUtil;
|
|
|
|
|
|
+import java.util.Comparator;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
@@ -182,7 +184,9 @@ public class PassengerInfoServiceImpl extends ServiceImpl<PassengerInfoMapper, P
|
|
|
|
|
|
QueryWrapper<PassengerCheckRecord> checkWrapper = new QueryWrapper<PassengerCheckRecord>().checkSqlInjection();
|
|
|
List<PassengerCheckRecord> checks = passengerCheckRecordService.list(checkWrapper.lambda().eq(PassengerCheckRecord::getPassengerId, passengerInfoIdParam.getId()));
|
|
|
-
|
|
|
+ if(CollectionUtil.isNotEmpty(checks)){
|
|
|
+ checks.sort(Comparator.comparing(PassengerCheckRecord::getCreateTime));
|
|
|
+ }
|
|
|
detailVo.setGoods(goods);
|
|
|
detailVo.setChecks(checks);
|
|
|
return detailVo;
|