From 5247f5d991b09bef8dce64ca8fac0e9c804f4584 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 四月 2025 09:10:22 +0800
Subject: [PATCH] feat(eims): 优化数据导入功能并添加创建时间排序
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java
index 4901462..96596a8 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java
@@ -12,7 +12,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.eims.domain.EimsInspectPlan;
+import org.dromara.eims.domain.EimsInspectSt;
import org.dromara.eims.domain.EimsMaintPlan;
+import org.dromara.eims.domain.bo.EimsInspectStBo;
+import org.dromara.eims.domain.vo.EimsInspectStVo;
import org.dromara.eims.domain.vo.EimsMaintOrderVo;
import org.dromara.eims.mapper.EimsInspectPlanMapper;
import org.dromara.eims.mapper.EimsMaintPlanMapper;
@@ -73,6 +76,7 @@
return TableDataInfo.build(page);
}
+
/**
* 鏌ヨ绗﹀悎鏉′欢鐨勭偣妫�璁板綍鍒楄〃
*
@@ -96,6 +100,8 @@
lqw.eq(bo.getInspTime() != null, EimsInspectRecord::getInspTime, bo.getInspTime());
lqw.eq(bo.getPlanTime() != null, EimsInspectRecord::getPlanTime, bo.getPlanTime());
lqw.eq(bo.getVerifyUser() != null, EimsInspectRecord::getVerifyUser, bo.getVerifyUser());
+ // 鎸夊垱寤烘椂闂村�掑簭
+ lqw.orderByDesc(EimsInspectRecord::getCreateTime);
return lqw;
}
@@ -112,6 +118,8 @@
qw.in(bo.getInspDept() != null, "ir.insp_dept", getAllDescendantIds(bo.getInspDept()));
qw.eq(bo.getStatus() != null, "ir.status", bo.getStatus());
qw.eq(bo.getInspResult() != null, "ir.insp_result", bo.getInspResult());
+ qw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null,
+ "ir.plan_time", params.get("beginPlanTime"), params.get("endPlanTime"));
qw.eq(bo.getPlanTime()!=null,
"ir.plan_time", bo.getPlanTime());
qw.orderByDesc("ir.create_time");
@@ -119,6 +127,7 @@
}
+
/**
* 鏍规嵁id锛岃幏鍙栨墍鏈夊悗浠d
*
--
Gitblit v1.9.3