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 | 10 ++++++++--
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java | 6 +++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
index fdfb916..6fced61 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
@@ -78,9 +78,9 @@
* */
@GetMapping(path="queryAttendUser")
@Log("鏌ヨ浜哄憳鍑哄嫟鐜�")
- public BaseResponse<List<JSONObject>> queryAttendUser(){
- List<JSONObject> list = sv.queryAttendUser();
- return BaseResponseUtils.buildSuccess(list);
+ public BaseResponse<JSONObject> queryAttendUser(){
+ JSONObject obj = sv.queryAttendUser();
+ return BaseResponseUtils.buildSuccess(obj);
}
/**
* 浠诲姟鐪嬫澘 鏌ヨ鍦ㄤ骇浠诲姟鐪嬫澘
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 a107e2a..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
@@ -219,12 +219,18 @@
List<JSONObject> list = deviceProductionLogDao.queryTopError(startDt, endDt);
return list;
}
- public List<JSONObject> queryAttendUser() {
+ 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);
- return list;
+ 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() {
--
Gitblit v1.8.0