From fc76b6c4a7ccd2d875b0fb998a868fe4bea188f7 Mon Sep 17 00:00:00 2001
From: 朱桂飞 <zhuguifei@zhuguifeideMacBook-Air.local>
Date: 星期五, 14 二月 2025 09:19:18 +0800
Subject: [PATCH] 新增设备台账导入
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
index 42fa842..6ef4ace 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
@@ -68,19 +68,21 @@
private QueryWrapper<EimsRepairReq> buildWrapper(EimsRepairReqBo bo) {
Map<String, Object> params = bo.getParams();
QueryWrapper<EimsRepairReq> qw = Wrappers.query();
- qw.eq(StringUtils.isNotBlank(bo.getCode()),"code", bo.getCode());
- qw.eq(StringUtils.isNotBlank(bo.getStatus()), "status", bo.getStatus());
- qw.eq(bo.getReqTime() != null, "req_time", bo.getReqTime());
- qw.eq(bo.getReqDept() != null, "req_dept", bo.getReqDept());
- qw.eq(bo.getReqUser() != null,"req_user", bo.getReqUser());
- qw.eq(StringUtils.isNotBlank(bo.getUrgencyLevel()), "urgency_level", bo.getUrgencyLevel());
- qw.eq(StringUtils.isNotBlank(bo.getReqType()), "req_type", bo.getReqType());
- qw.eq(bo.getEquId() != null, "equ_id", bo.getEquId());
- qw.eq(bo.getRepairDept() != null,"repair_dept", bo.getRepairDept());
- qw.eq(bo.getRepairUser() != null, "repair_user", bo.getRepairUser());
- qw.eq(StringUtils.isNotBlank(bo.getFaultType()), "fault_type", bo.getFaultType());
+ qw.like(StringUtils.isNotBlank(bo.getCode()),"a.code", bo.getCode());
+ qw.eq(StringUtils.isNotBlank(bo.getStatus()), "a.status", bo.getStatus());
+ qw.eq(bo.getReqTime() != null, "a.req_time", bo.getReqTime());
+ qw.eq(bo.getReqDept() != null, "a.req_dept", bo.getReqDept());
+ qw.eq(bo.getReqUser() != null,"a.req_user", bo.getReqUser());
+ qw.eq(StringUtils.isNotBlank(bo.getUrgencyLevel()), "a.urgency_level", bo.getUrgencyLevel());
+ qw.eq(StringUtils.isNotBlank(bo.getReqType()), "a.req_type", bo.getReqType());
+ qw.eq(bo.getEquId() != null, "a.equ_id", bo.getEquId());
+ qw.eq(bo.getRepairDept() != null,"a.repair_dept", bo.getRepairDept());
+ qw.eq(bo.getRepairUser() != null, "a.repair_user", bo.getRepairUser());
+ qw.eq(StringUtils.isNotBlank(bo.getFaultType()), "a,fault_type", bo.getFaultType());
+ qw.eq(params.containsKey("createBy"), "a.create_by", params.get("createBy"));
+ qw.eq(params.containsKey("status"), "a.status", params.get("status"));
qw.between(params.get("beginReqTime") != null && params.get("endReqTime") != null,
- "req_time", params.get("beginReqTime"), params.get("endReqTime"));
+ "a.req_time", params.get("beginReqTime"), params.get("endReqTime"));
return qw;
}
--
Gitblit v1.9.3