From 5d813bb3a09810648e607a46d44f350686e3dc28 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 09 七月 2024 09:45:33 +0800
Subject: [PATCH] device report finish
---
pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java b/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java
index ae28116..91fcdc9 100644
--- a/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java
+++ b/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java
@@ -2,9 +2,7 @@
import com.alibaba.excel.util.StringUtils;
import com.dy.pmsGlobal.daoSta.*;
-import com.dy.pmsGlobal.pojoSta.StaDeviceLast;
-import com.dy.pmsGlobal.pojoSta.StaDeviceLife;
-import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog;
+import com.dy.pmsGlobal.pojoSta.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -62,18 +60,13 @@
deviceInfo.put("deviceLog", log);
// 鏌ヨ璁惧鐢熷懡鍛ㄦ湡
List<StaDeviceLife> deviceLife = deviceLifeDao.selectByEquipNo(deviceNo);
- deviceInfo.put("deviceLife", log);
+ deviceInfo.put("deviceLife", deviceLife);
// 鏌ヨ璁惧缁翠慨淇℃伅
- /*StaRepairInfo repairInfo = repairInfoDao.selectByDeviceNo(deviceNo);
-
- if (preRecord.getStatus() == 1) {
- if (repairInfo == null) {
- return null;
- }
- // 鏌ヨ璁惧缁翠慨淇℃伅
- StaWipSnEx wipSnEx = wipSnExDao.selectByDeviceNo();
- }
- return DeviceReportDao.getDeviceInfo(deviceNo);*/
+ List<StaRepairInfo> repairInfo = repairInfoDao.selectByEquipNo(deviceNo);
+ deviceInfo.put("deviceRepair", repairInfo);
+ // 鏌ヨ璁惧闄勪欢淇℃伅
+ List<StaWipSnEx> wipSnEx = wipSnExDao.selectByDeviceNo(deviceNo);
+ deviceInfo.put("deviceAttach", wipSnEx);
return deviceInfo;
}
}
--
Gitblit v1.8.0