From dfe6c610fe4a6b2c99dc9ee66ef8f6fe1c89ceda Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 22 四月 2026 11:19:29 +0800
Subject: [PATCH] feat: 入库审批添加关联订单信息和产品明细
---
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
index 0c00da7..7bbab8e 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
@@ -1,7 +1,9 @@
package com.ruoyi.device.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.device.mapper.MaintenanceTaskMapper;
import com.ruoyi.device.pojo.MaintenanceTask;
@@ -39,8 +41,18 @@
private MaintenanceTaskScheduler maintenanceTaskScheduler;
@Override
- public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
- Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, null);
+ public AjaxResult listPage(Page<MaintenanceTask> page, MaintenanceTask maintenanceTask) {
+ LambdaQueryWrapper<MaintenanceTask> queryWrapper = new LambdaQueryWrapper<>();
+ if (maintenanceTask != null) {
+ if (StringUtils.isNotEmpty(maintenanceTask.getTaskName())) {
+ queryWrapper.like(MaintenanceTask::getTaskName, maintenanceTask.getTaskName());
+ }
+ if (StringUtils.isNotEmpty(maintenanceTask.getStatus())) {
+ queryWrapper.eq(MaintenanceTask::getStatus, maintenanceTask.getStatus());
+ }
+ }
+ queryWrapper.orderByDesc(MaintenanceTask::getCreateTime);
+ Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, queryWrapper);
// 2. 濡傛灉娌℃湁鏁版嵁锛岀洿鎺ヨ繑鍥炵┖鍒嗛〉
if (taskPage.getRecords().isEmpty()) {
return AjaxResult.success(taskPage);
--
Gitblit v1.9.3