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/ScreenReportCtrl.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 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..805dfca 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
@@ -6,6 +6,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
+import com.dy.pmsGlobal.pojoPr.PrOrder;
import com.dy.pmsGlobal.pojoPr.PrProductionProcess;
import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog;
import jakarta.validation.Valid;
@@ -73,32 +74,30 @@
List<JSONObject> list = sv.queryTopError();
return BaseResponseUtils.buildSuccess(list);
}
- /**
- * 浠诲姟鐪嬫澘 鏌ヨ鍦ㄤ骇浠诲姟鐪嬫澘
- * */
@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);
}
- /**
- * 浠诲姟鐪嬫澘 鏌ヨ鍦ㄤ骇浠诲姟鐪嬫澘
- * */
@GetMapping(path="queryStatisticWork")
- @Log("鏌ヨ璁㈠崟鐪嬫澘")
+ @Log("鏌ヨ缁熻浜哄憳宸ヤ綔閲�")
public BaseResponse<List<JSONObject>> queryStatisticWork(){
List<JSONObject> list = sv.queryStatisticWork();
return BaseResponseUtils.buildSuccess(list);
}
- /**
- * 浠诲姟鐪嬫澘 鏌ヨ鍦ㄤ骇浠诲姟鐪嬫澘
- * */
+
@GetMapping(path="queryOrderList")
@Log("鏌ヨ璁㈠崟鐪嬫澘")
- public BaseResponse<List<JSONObject>> queryOrderList(){
- List<JSONObject> list = sv.queryOrderList();
+ public BaseResponse<List<PrOrder>> queryOrderList(){
+ List<PrOrder> list = sv.queryOrderList();
return BaseResponseUtils.buildSuccess(list);
}
+ @GetMapping(path="queryOrderStatistic")
+ @Log("鏌ヨ缁熻璁㈠崟鏁伴噺")
+ public BaseResponse<JSONObject> queryOrderStatistic(){
+ JSONObject obj = sv.queryStatisticOrder();
+ return BaseResponseUtils.buildSuccess(obj);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0