增加筛选
This commit is contained in:
+7
@@ -1,7 +1,9 @@
|
|||||||
package com.renkang.emergency.service.impl;
|
package com.renkang.emergency.service.impl;
|
||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
|
import cn.hutool.core.date.DateField;
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
|
import cn.hutool.core.util.ObjUtil;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
@@ -65,6 +67,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|||||||
handleQueryWrapper(order, salvageUserName, initiatorUserName, queryWrapper);
|
handleQueryWrapper(order, salvageUserName, initiatorUserName, queryWrapper);
|
||||||
// 处理应急中心
|
// 处理应急中心
|
||||||
handleCenterAndManagerWrapper(queryWrapper, order.getCenterId(), order.getOrgCode());
|
handleCenterAndManagerWrapper(queryWrapper, order.getCenterId(), order.getOrgCode());
|
||||||
|
if (ObjUtil.isNotEmpty(order.getCreateTimeStart()) && ObjUtil.isNotEmpty(order.getCreateTimeEnd())) {
|
||||||
|
queryWrapper.between("create_time",
|
||||||
|
DateUtil.beginOfDay(order.getCreateTimeStart()),
|
||||||
|
DateUtil.endOfDay(order.getCreateTimeEnd()).offset(DateField.MILLISECOND, -999));
|
||||||
|
}
|
||||||
Page<Order> result = page(page, queryWrapper);
|
Page<Order> result = page(page, queryWrapper);
|
||||||
if (ObjectUtil.isNull(result) || CollectionUtils.isEmpty(result.getRecords())) {
|
if (ObjectUtil.isNull(result) || CollectionUtils.isEmpty(result.getRecords())) {
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
Reference in New Issue
Block a user