From fe8db21391c7bc26044084ee4f0aa970994b56c7 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期四, 11 九月 2025 13:45:03 +0800
Subject: [PATCH] 新增预测性维护两个页面部分接口

---
 ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbBatchServiceImpl.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbBatchServiceImpl.java b/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbBatchServiceImpl.java
index ce9ed02..20ecf84 100644
--- a/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbBatchServiceImpl.java
+++ b/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbBatchServiceImpl.java
@@ -1,5 +1,8 @@
 package cn.shlanbao.qms.service.impl;
 
+import cn.shlanbao.qms.domain.LbSensorResult;
+import cn.shlanbao.qms.domain.vo.LbSensorResultVo;
+import cn.shlanbao.qms.mapper.LbSensorResultMapper;
 import cn.shlanbao.qms.service.ILbTestResultService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -31,7 +34,7 @@
 public class LbBatchServiceImpl implements ILbBatchService {
 
     private final LbBatchMapper baseMapper;
-
+    private final LbSensorResultMapper sensorResultMapper;
     private final ILbTestResultService testResultService;
 
     /**
@@ -42,7 +45,22 @@
      */
     @Override
     public LbBatchVo queryById(Long id){
-        return baseMapper.selectVoById(id);
+        LbBatchVo lbBatchVo = baseMapper.selectVoById(id);
+        if(lbBatchVo!=null){
+            LambdaQueryWrapper<LbSensorResult> sensorResultWrapper = new LambdaQueryWrapper<>();
+            sensorResultWrapper.eq(LbSensorResult::getBatchCode, lbBatchVo.getBatchCode());
+            List<LbSensorResultVo> sensorResultVoList = sensorResultMapper.selectVoList(sensorResultWrapper);
+            long okCount = sensorResultVoList.stream()
+                .filter(vo -> "OK".equals(vo.getJudgeResult()))
+                .count();
+
+            long ngCount = sensorResultVoList.stream()
+                .filter(vo -> "NG".equals(vo.getJudgeResult()))
+                .count();
+            lbBatchVo.setOkNum(okCount);
+            lbBatchVo.setNgNum(ngCount);
+        }
+        return lbBatchVo;
     }
 
     /**
@@ -83,6 +101,9 @@
         lqw.eq(bo.getUserId() != null, LbBatch::getUserId, bo.getUserId());
         lqw.eq(bo.getNum() != null, LbBatch::getNum, bo.getNum());
         lqw.orderByDesc(LbBatch::getBatchCode);
+        if(params!=null && params.containsKey("startTime")&&params.containsKey("endTime")) {
+            lqw.between(LbBatch::getBatchTime,params.get("startTime"),params.get("endTime"));
+        }
         return lqw;
     }
 

--
Gitblit v1.9.3