From 453f63fd6cd6466222304df619e62b3a5667ca68 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 05 八月 2025 13:56:47 +0800
Subject: [PATCH] 修复0730测试问题
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 de21a3f..8762224 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
@@ -104,6 +104,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;
}
@@ -114,6 +116,11 @@
qw.like(StringUtils.isNotBlank(bo.getInspName()),"ir.insp_name", bo.getInspName());
qw.like(bo.getEquName() != null, "equ.equ_name", bo.getEquName());
qw.like(bo.getAssetNo() != null, "equ.asset_no", bo.getAssetNo());
+ if (params.get("searchValue") != null && StringUtils.isNotBlank(params.get("searchValue").toString())) {
+ qw.and(wq -> wq.like("equ.equ_name", params.get("searchValue"))
+ .or().like("equ.asset_no", params.get("searchValue"))
+ );
+ }
qw.like(bo.getEquId() != null, "equ.equ_id", bo.getEquId());
qw.eq(StringUtils.isNotBlank(bo.getInspType()), "ir.insp_type", bo.getInspType());
qw.eq(bo.getInspUser() != null, "ir.insp_user", bo.getInspUser());
@@ -172,7 +179,7 @@
Long planId = bo.getPlanId();
if(planId!=null){
EimsInspectPlan plan = planMapper.selectById(planId);
- setInspNextTime(plan);
+ // setInspNextTime(plan);
planMapper.updateById(plan);
}
@@ -245,10 +252,19 @@
LoginUser loginUser = LoginHelper.getLoginUser();
List<EimsInspectRecord> inspRecordList = MapstructUtils.convert(bo.getInspRecordList(), EimsInspectRecord.class);
inspRecordList.forEach(item->{
- // 鏇存柊涓哄凡鐐规
- item.setStatus(DictConstants.EIMS_INSPECT_STATUS_DETAIL.Y);
- item.setInspTime(new Date());
- item.setInspUser(loginUser.getUserId());
+ // 鍓嶇浼犲叆鐘舵��
+ // item.setStatus(DictConstants.EIMS_INSPECT_STATUS_DETAIL.Y);
+// item.setInspTime(new Date());
+// item.setInspUser(loginUser.getUserId());
+ // 鐐规(0)-> 寰呯‘璁�(1)
+ if(item.getInspUser()==null && (item.getStatus()!=null && item.getStatus().equals("1"))){
+ item.setInspUser(loginUser.getUserId());
+ }
+ // 寰呯‘璁�(1)-> 瀹屾垚(2)
+ if(item.getVerifyUser()==null&& (item.getStatus()!=null && item.getStatus().equals("2"))){
+ item.setVerifyUser(loginUser.getUserId());
+ }
+
});
return baseMapper.updateBatchById(inspRecordList);
}
--
Gitblit v1.9.3