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/DeviceReportCtl.java | 2 +-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java | 3 +++
pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java | 21 +++++++--------------
pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml | 7 ++++++-
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java
index e8cc328..cb50d78 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java
@@ -3,6 +3,8 @@
import com.dy.pmsGlobal.pojoSta.StaRepairInfo;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
/**
* @author User
* @description 閽堝琛ㄣ�恠ta_repair_info銆戠殑鏁版嵁搴撴搷浣淢apper
@@ -24,4 +26,5 @@
int updateByPrimaryKey(StaRepairInfo record);
+ List<StaRepairInfo> selectByEquipNo(String equipNo);
}
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml
index 984ece3..0f4ff2d 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml
@@ -26,7 +26,12 @@
from sta_repair_info
where id = #{id,jdbcType=BIGINT}
</select>
-
+ <select id="selectByEquipNo" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from sta_repair_info
+ where equip_no = #{equipNo,jdbcType=VARCHAR}
+ </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from sta_repair_info
where id = #{id,jdbcType=BIGINT}
diff --git a/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportCtl.java b/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportCtl.java
index 75ad088..3ab6997 100644
--- a/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportCtl.java
+++ b/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportCtl.java
@@ -25,7 +25,7 @@
@GetMapping(path = "getDeviceInfo")
public BaseResponse<Map<String, Object>> getDeviceInfo(String deviceNo) {
- log.info("DeviceReportCtl.getDeviceInfo()");
+ log.info("DeviceReportCtl.getDeviceInfo():{}",deviceNo);
Map<String, Object> result = sv.getDeviceInfo(deviceNo);
return BaseResponseUtils.buildSuccess(result);
}
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