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/EimsInspectStServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 e8e6f60..d59e63a 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
@@ -11,9 +11,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
+import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.eims.domain.EimsEqu;
import org.dromara.eims.domain.EimsInspectRecord;
+import org.dromara.eims.domain.EimsMaintOrder;
import org.dromara.eims.domain.vo.EimsInspectRecordVo;
+import org.dromara.eims.domain.vo.EimsMaintStVo;
import org.dromara.eims.mapper.EimsEquMapper;
import org.dromara.eims.mapper.EimsInspectRecordMapper;
import org.springframework.stereotype.Service;
@@ -171,7 +174,7 @@
List<EimsInspectRecordVo> recordList = recordMapper.selectVoList(recordLqw);
// TODO 鏍规嵁瀛楀吀eims_inspect_status
Map<String, Long> cMap = recordList.stream()
- .filter(order -> List.of("0", "1").contains(order.getStatus()))
+ .filter(order -> List.of("0","1", "2").contains(order.getStatus()))
.collect(Collectors.groupingBy(EimsInspectRecordVo::getStatus, Collectors.counting()));
// TODO 鏍规嵁瀛楀吀eims_inspect_result
Map<String, Long> rMap = recordList.stream()
@@ -180,7 +183,8 @@
stVo.setRecordCount(recordList.size());
stVo.setUnCheckCount(cMap.getOrDefault("0", 0L).intValue());
- stVo.setCheckCount(cMap.getOrDefault("1", 0L).intValue());
+ stVo.setDqrCount(cMap.getOrDefault("1", 0L).intValue());
+ stVo.setCheckCount(cMap.getOrDefault("2", 0L).intValue());
stVo.setNormalNum(rMap.getOrDefault("1", 0L).intValue());
stVo.setAbNormalNum(rMap.getOrDefault("2", 0L).intValue());
@@ -294,6 +298,30 @@
// if(update.getVerifyTime()==null) update.setVerifyTime(new Date());
// }
// }
+
+
+ //鐐规姹囨�诲畬鎴愰渶鍚屾鏇存柊st涓嬪瓙宸ュ崟
+
+ EimsInspectStVo st = baseMapper.selectVoById(bo.getId());
+
+ Long equId = st.getEquId();
+ String planTime = DateUtils.dateTime(st.getPlanTime());
+ LambdaQueryWrapper<EimsInspectRecord> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(EimsInspectRecord::getEquId,equId);
+ wrapper.eq(EimsInspectRecord::getPlanTime,planTime);
+ List<EimsInspectRecord> recordList = recordMapper.selectList(wrapper);
+ // st涓嬪瓙宸ュ崟鎵�鏈夌姸鎬佽缃负3-宸插畬鎴�
+ recordList.forEach(order -> {
+ order.setStatus(bo.getStatus());
+ if(order.getStatus().equals("1")){
+ order.setInspUser(LoginHelper.getUserId());
+ }else if(order.getStatus().equals("2")){
+ order.setVerifyUser(LoginHelper.getUserId());
+ }
+ });
+ recordMapper.updateBatchById(recordList);
+
+
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
--
Gitblit v1.9.3