From dfe65c30a3fa372af98e8341ea46b1c4bf7cc725 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 11:35:55 +0800
Subject: [PATCH] 增补属性的json中的顺序
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
index 77e36a9..98a7e5f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
@@ -342,10 +342,10 @@
openTypeName = "鐢ㄦ埛杩滅▼寮�闃�";
break;
case 11:
- openTypeName = "寮�鍏抽榾鍗″紑闃�";
+ openTypeName = "宸℃鍗″紑闃�";
break;
case 13:
- openTypeName = "寮�鍏抽榾鍗″紑闃�";
+ openTypeName = "宸℃鍗″紑闃�";
break;
default:
openTypeName = "涓嶇煡閬撴偍瑕佹煡閭ｇ寮�闃�绫诲瀷";
@@ -412,7 +412,7 @@
closeTypeName = "鐢ㄦ埛杩滅▼鍏抽榾";
break;
case 10:
- closeTypeName = "寮�鍏抽榾鍗″叧闃�";
+ closeTypeName = "宸℃鍗″叧闃�";
break;
case 12:
closeTypeName = "榛戝悕鍗曞懡浠ゅ叧闃�";
@@ -771,4 +771,41 @@
rsVo.obj = rmLossDayLastMapper.getMonthLossAmount(params);
return rsVo ;
}
+
+ /**
+ * 鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoIntakeUnReported>> getUnReportedIntakes(CommonQO qo) {
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+ if(timeStart == "") {
+ timeStart = null;
+ }
+ if(timeStop == "") {
+ timeStop = null;
+ }
+ if(timeStart != null && timeStart != "") {
+ timeStart = timeStart + " 00:00:00";
+ }
+ qo.setTimeStart(timeStart);
+
+ if(timeStop != null && timeStop != "") {
+ timeStop = timeStop + " 23:59:59";
+ }
+ qo.setTimeStop(timeStop);
+
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmOnHourReportLastMapper.getUnReportedIntakesCount(params);
+
+ QueryResultVo<List<VoIntakeUnReported>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmOnHourReportLastMapper.getUnReportedIntakes(params);
+ return rsVo ;
+ }
}
--
Gitblit v1.8.0