renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加筛选

Browse Source
This commit is contained in:
wanghao
2025-12-15 18:03:46 +08:00
parent 7c337a40a7
commit 79c8bd0da1
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/OrderServiceImpl.java
+10 -3
View File
@@ -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;
@@ -62,9 +64,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
handleOrder(order, orderCopy); handleOrder(order, orderCopy);
QueryWrapper<Order> queryWrapper = QueryGenerator.initQueryWrapper(orderCopy, req.getParameterMap()); QueryWrapper<Order> queryWrapper = QueryGenerator.initQueryWrapper(orderCopy, req.getParameterMap());
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;
@@ -220,7 +227,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
LoginUser loginUser = GlobalUtils.getLoginUser(); LoginUser loginUser = GlobalUtils.getLoginUser();
// 筛选条件: 员工姓名 状态 时间段 // 筛选条件: 员工姓名 状态 时间段
QueryWrapper<Order> queryWrapper = new QueryWrapper<>(); QueryWrapper<Order> 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().eq(Order::getMajorUserId, loginUser.getId());
queryWrapper.lambda().and(orWrapper -> orWrapper.eq(Order::getMajorUserId, loginUser.getId()).or().eq(Order::getMajorUserTwoId, 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<OrderMapper, Order> implements
BeanUtil.copyProperties(order, copy); BeanUtil.copyProperties(order, copy);
} }
private void handleQueryWrapper(Order orderCopy, String salvageUserName,String initiatorUserName, QueryWrapper<Order> queryWrapper) { private void handleQueryWrapper(Order orderCopy, String salvageUserName, String initiatorUserName, QueryWrapper<Order> queryWrapper) {
if (ObjectUtil.isNull(orderCopy)) { if (ObjectUtil.isNull(orderCopy)) {
return; return;
} }