|
|
|
|
@ -46,6 +46,7 @@ import java.net.URLConnection; |
|
|
|
|
import java.net.URLEncoder; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.function.Consumer; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 工单表 控制器 |
|
|
|
|
@ -129,6 +130,20 @@ public class WorkOrderController extends BladeController { |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// 处理维修人员名称查询条件
|
|
|
|
|
if (StringUtils.isNotBlank(workOrderDTO.getRepairPersonName())) { |
|
|
|
|
// 根据维修人员的名字模糊查询用户列表
|
|
|
|
|
List<User> userList = userService.list(Wrappers.lambdaQuery(User.class) |
|
|
|
|
.like(User::getName, workOrderDTO.getRepairPersonName())); |
|
|
|
|
|
|
|
|
|
if (!userList.isEmpty()) { |
|
|
|
|
List<Long> userIds = userList.stream().map(User::getId).collect(Collectors.toList()); |
|
|
|
|
wrapper.in(WorkOrder::getRepairPerson, userIds); |
|
|
|
|
} else { |
|
|
|
|
// 如果没有找到对应的用户,则使查询结果为空
|
|
|
|
|
wrapper.and(w -> w.eq(WorkOrder::getId, -1L)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 执行分页查询
|
|
|
|
|
IPage<WorkOrder> pages = workOrderService.page(Condition.getPage(query), wrapper); |
|
|
|
|
|