From abe0f082f328098dbd0964a821b77d0e34179e70 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 09 一月 2025 11:36:52 +0800
Subject: [PATCH] edit queryAttendUser
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 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..36a8150 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,8 +45,11 @@
private StaDeviceProductionLogMapper deviceProductionLogDao;
private StaRepairInfoMapper repairInfoDao;
private PrAssemblyPlanMapper assemblyPlanDao;
+ private StaAssemblyWorkLastMapper assemblyWorkLastDao;
+
private OthStatisticWorkloadMapper workloadDao;
private PrOrderMapper orderDao;
+ private OthStatisticWorkloadMapper statisticWorkDao;
@Autowired
public void setOrderDao(PrOrderMapper orderDao) {
@@ -78,6 +82,11 @@
}
@Autowired
+ public void setAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
+ this.assemblyWorkLastDao = assemblyWorkLastDao;
+ }
+
+ @Autowired
public void setRepairInfoDao(StaRepairInfoMapper repairInfoDao) {
this.repairInfoDao = repairInfoDao;
}
@@ -85,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) {
@@ -158,6 +172,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 +212,31 @@
}
}
}
+
+ 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 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);
+ if(list.size() == 0){
+ JSONObject obj = new JSONObject();
+ obj.set("require_attend", "0");
+ obj.set("actual_attend", "0");
+ return obj;
+ }
+ return list.get(0);
+ }
+
+ 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