From 79c8bd0da12917ca85194517f33814eac0485a43 Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 15 Dec 2025 18:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emergency/service/impl/OrderServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/OrderServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/OrderServiceImpl.java index 429a32e..e33f5a6 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/OrderServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/OrderServiceImpl.java @@ -1,7 +1,9 @@ package com.renkang.emergency.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -62,9 +64,14 @@ public class OrderServiceImpl extends ServiceImpl implements handleOrder(order, orderCopy); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderCopy, req.getParameterMap()); - handleQueryWrapper(order, salvageUserName,initiatorUserName, queryWrapper); + handleQueryWrapper(order, salvageUserName, initiatorUserName, queryWrapper); // 处理应急中心 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 result = page(page, queryWrapper); if (ObjectUtil.isNull(result) || CollectionUtils.isEmpty(result.getRecords())) { return result; @@ -220,7 +227,7 @@ public class OrderServiceImpl extends ServiceImpl implements LoginUser loginUser = GlobalUtils.getLoginUser(); // 筛选条件: 员工姓名 状态 时间段 QueryWrapper queryWrapper = new QueryWrapper<>(); - handleQueryWrapper(order, order.getSalvageUserName(),order.getInitiatorUserName(), queryWrapper); + handleQueryWrapper(order, order.getSalvageUserName(), order.getInitiatorUserName(), queryWrapper); //queryWrapper.lambda().eq(Order::getMajorUserId, loginUser.getId()); queryWrapper.lambda().and(orWrapper -> orWrapper.eq(Order::getMajorUserId, loginUser.getId()).or().eq(Order::getMajorUserTwoId, loginUser.getId())); @@ -282,7 +289,7 @@ public class OrderServiceImpl extends ServiceImpl implements BeanUtil.copyProperties(order, copy); } - private void handleQueryWrapper(Order orderCopy, String salvageUserName,String initiatorUserName, QueryWrapper queryWrapper) { + private void handleQueryWrapper(Order orderCopy, String salvageUserName, String initiatorUserName, QueryWrapper queryWrapper) { if (ObjectUtil.isNull(orderCopy)) { return; }