From ccb39e91f2feaeafa2d89440c84d14db22bf856f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 五月 2025 10:47:01 +0800
Subject: [PATCH] FastJson的Configuration中去掉不推荐应用的JSONWriter.Feature.MapSortField（对map进行排序）
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 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 a97e7e4..eb86ddc 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) {
@@ -94,6 +96,10 @@
this.workloadDao = workloadDao;
}
+ @Autowired
+ public void setStatisticWorkDao(OthStatisticWorkloadMapper statisticWorkDao) {
+ this.statisticWorkDao = statisticWorkDao;
+ }
public Map<String, Object> getDeviceInfo(String deviceNo) {
if (StringUtils.isBlank(deviceNo)) {
@@ -171,14 +177,13 @@
return list;
}
- public List<JSONObject> queryOrderList() {
- List<JSONObject> list = assemblyPlanDao.queryPlanList();
- /* Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize();
- List<PrOrder> orderList = orderDao.selectAll(params);
+ public List<PrOrder> queryOrderList() {
+ Map<String, Object> params = new HashMap<>();
+ List<PrOrder> orderList = orderDao.selectSome(params);
for (PrOrder prOrder : orderList) {
changeRate(prOrder);
- }*/
- return null;
+ }
+ return orderList;
}
private void changeRate(PrOrder prOrder) {
if (prOrder != null && prOrder.items != null) {
@@ -208,7 +213,41 @@
}
public List<JSONObject> queryTopError() {
- List<JSONObject> list = deviceProductionLogDao.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;
+ }
+ public JSONObject queryStatisticOrder() {
+ List<JSONObject> list = orderDao.queryStatisticOrder();
+ if(list.size() == 0){
+ JSONObject obj = new JSONObject();
+ obj.set("total", "0");
+ obj.set("year_total", "0");
+ obj.set("complete", "0");
+ obj.set("uncomplete", "0");
+ return obj;
+ }
+ return list.get(0);
+ }
}
--
Gitblit v1.8.0