From 11d2a1de77bf389aef8fa785aa2983ace773a0ec Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 07 一月 2025 16:13:29 +0800
Subject: [PATCH] edit
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
index ab40034..8d6cd6e 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
@@ -1,6 +1,7 @@
package com.dy.pmsOther.screen;
+import cn.hutool.core.date.DateTime;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -44,6 +45,8 @@
private StaDeviceProductionLogMapper deviceProductionLogDao;
private StaRepairInfoMapper repairInfoDao;
private PrAssemblyPlanMapper assemblyPlanDao;
+ private StaAssemblyWorkLastMapper assemblyWorkLastDao;
+
private OthStatisticWorkloadMapper workloadDao;
private PrOrderMapper orderDao;
@@ -78,6 +81,11 @@
}
@Autowired
+ public void setAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
+ this.assemblyWorkLastDao = assemblyWorkLastDao;
+ }
+
+ @Autowired
public void setRepairInfoDao(StaRepairInfoMapper repairInfoDao) {
this.repairInfoDao = repairInfoDao;
}
@@ -86,6 +94,7 @@
public void setWorkloadDao(OthStatisticWorkloadMapper workloadDao) {
this.workloadDao = workloadDao;
}
+
public Map<String, Object> getDeviceInfo(String deviceNo) {
if (StringUtils.isBlank(deviceNo)) {
@@ -158,6 +167,10 @@
return map.values().stream().collect(Collectors.toList());*/
return list;
}
+ public List<JSONObject> queryWorkList() {
+ List<JSONObject> list = assemblyWorkLastDao.queryWorkList();
+ return list;
+ }
public List<JSONObject> queryOrderList() {
List<JSONObject> list = assemblyPlanDao.queryPlanList();
@@ -194,4 +207,18 @@
}
}
}
+
+ public List<JSONObject> queryTopError() {
+ Date startDt = Date.from(LocalDateTime.of(LocalDate.now().minusDays(2000), LocalTime.of(0, 0, 0)).atZone(ZoneId.systemDefault()).toInstant());
+ Date endDt = new Date();
+ List<JSONObject> list = deviceProductionLogDao.queryTopError(startDt, endDt);
+ return list;
+ }
+ public List<JSONObject> queryAttendUser() {
+ Date startDt = Date.from(LocalDateTime.of(LocalDate.now().minusDays(2000), LocalTime.of(0, 0, 0)).atZone(ZoneId.systemDefault()).toInstant());
+ Date endDt = new Date();
+ Date todayDt = Date.from(LocalDateTime.of(LocalDate.now(), LocalTime.of(0, 0, 0)).atZone(ZoneId.systemDefault()).toInstant());
+ List<JSONObject> list = assemblyWorkLastDao.queryAttendUser(startDt, endDt,todayDt);
+ return list;
+ }
}
--
Gitblit v1.8.0