From 87d0248925a5a8c3cf07ba8a0283dc363e2b59f4 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 07 一月 2025 17:02:20 +0800
Subject: [PATCH] statistic_work
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 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 3520071..a107e2a 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;
@@ -48,6 +49,7 @@
private OthStatisticWorkloadMapper workloadDao;
private PrOrderMapper orderDao;
+ private OthStatisticWorkloadMapper statisticWorkDao;
@Autowired
public void setOrderDao(PrOrderMapper orderDao) {
@@ -92,6 +94,11 @@
@Autowired
public void setWorkloadDao(OthStatisticWorkloadMapper workloadDao) {
this.workloadDao = workloadDao;
+ }
+
+ @Autowired
+ public void setStatisticWorkDao(OthStatisticWorkloadMapper statisticWorkDao) {
+ this.statisticWorkDao = statisticWorkDao;
}
public Map<String, Object> getDeviceInfo(String deviceNo) {
@@ -205,4 +212,25 @@
}
}
}
+
+ 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;
+ }
+
+ public List<JSONObject> queryStatisticWork() {
+ Date startDt = Date.from(LocalDateTime.of(LocalDate.now(), LocalTime.of(0, 0, 0)).atZone(ZoneId.systemDefault()).toInstant());
+ Date endDt = new Date();
+ List<JSONObject> list = statisticWorkDao.queryStatisticWork(startDt, endDt);
+ return list;
+ }
}
--
Gitblit v1.8.0