From 245cfffbbc8d96333eccf40885e6fdeeb0ed636e Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 20 六月 2025 14:18:54 +0800
Subject: [PATCH] feat(eims): 添加未完成维修工单数量查询功能,优化搜索设备、保养、点检、维修查询，增加关键字模糊查询
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java
index 199219d..00410e6 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectStServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.dromara.common.core.constant.DictConstants;
+import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -244,12 +245,24 @@
qw.like(StringUtils.isNotBlank(bo.getTitle()), "st.title", bo.getTitle());
qw.like(StringUtils.isNotBlank(bo.getEquName()), "equ.equ_name", bo.getEquName());
qw.like(StringUtils.isNotBlank(bo.getAssetNo()), "equ.asset_no", bo.getAssetNo());
+ if(bo.getPlanTime()!=null&&bo.getViewMode() != null && bo.getViewMode().equals("Day")){
+ qw.eq("DATE_FORMAT(st.plan_time, '%Y-%m-%d')", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,bo.getPlanTime()));
+ }else if(bo.getPlanTime()!=null&&bo.getViewMode() != null && bo.getViewMode().equals("Month")){
+ qw.eq("DATE_FORMAT(st.plan_time, '%Y-%m')", DateUtils.parseDateToStr(DateUtils.YYYY_MM,bo.getPlanTime()));
+ }
qw.eq( "st.type", bo.getType());
qw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null,
"st.plan_time", params.get("beginPlanTime"), params.get("endPlanTime"));
+ if (params.get("searchValue") != null && StringUtils.isNotBlank(params.get("searchValue").toString())) {
+ qw.and(wq -> wq.like("st.title", params.get("searchValue"))
+ .or().like("equ.equ_name", params.get("searchValue"))
+ .or().like("equ.asset_no", params.get("searchValue"))
+ );
+ }
qw.eq(bo.getInspUser() != null, "st.maint_user", bo.getInspUser());
qw.eq(bo.getVerifyUser() != null, "st.verify_user", bo.getVerifyUser());
qw.eq(bo.getStatus() != null, "st.status", bo.getStatus());
+ qw.eq(bo.getUpdateBy() != null, "st.update_by", bo.getUpdateBy());
qw.orderByDesc( "st.create_time");
return qw;
}
@@ -281,14 +294,14 @@
public Boolean updateByBo(EimsInspectStBo bo) {
EimsInspectSt update = MapstructUtils.convert(bo, EimsInspectSt.class);
- if(bo.getVerifyUser()!=null){
- EimsInspectSt st = baseMapper.selectById(bo.getId());
- String status = st.getStatus();
- if(status==null || status.equals(DictConstants.MAINT_ORDER_ST_STATUS_DETAIL.N)){
- if(update.getVerifyTime()==null) update.setStatus(DictConstants.MAINT_ORDER_ST_STATUS_DETAIL.Y);
- if(update.getVerifyTime()==null) update.setVerifyTime(new Date());
- }
- }
+// if(bo.getVerifyUser()!=null){
+// EimsInspectSt st = baseMapper.selectById(bo.getId());
+// String status = st.getStatus();
+// if(status==null || status.equals(DictConstants.MAINT_ORDER_ST_STATUS_DETAIL.N)){
+// if(update.getVerifyTime()==null) update.setStatus(DictConstants.MAINT_ORDER_ST_STATUS_DETAIL.Y);
+// if(update.getVerifyTime()==null) update.setVerifyTime(new Date());
+// }
+// }
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
--
Gitblit v1.9.3