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 | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 36a8150..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
@@ -177,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) {
@@ -239,4 +238,16 @@
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