|
|
|
@ -92,6 +92,9 @@ public class DmSygdMxController {
|
|
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
|
|
//// 1.根据上料时间 从近到远排序
|
|
|
|
|
List<DmSygdMx> list=service.list(new QueryWrapper<DmSygdMx>().between("jssj",mapObj.get("beginTime"),mapObj.get("endTime")));
|
|
|
|
|
if(list.size()==0){
|
|
|
|
|
return new ResultBean();
|
|
|
|
|
}
|
|
|
|
|
list = list.stream()
|
|
|
|
|
.filter(mx -> Objects.nonNull(mx.getJssj()))
|
|
|
|
|
.sorted(Comparator.comparing(DmSygdMx::getJssj, Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
|
|
|
|
|