From b27d0ba5ab7a11ac6615e0cfee3cf428a7ae834f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 29 五月 2024 08:56:34 +0800
Subject: [PATCH] 完善代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
index 83c819e..7c6804d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
@@ -132,6 +132,12 @@
DecimalFormat df = new DecimalFormat("0.00");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Integer pageSize = vo.getPageSize();
+ Integer pageCurr = vo.getPageCurr();
+ // 璧峰绱㈠紩浣嶇疆
+ Integer startIndex = (pageCurr - 1) * pageSize;
+
+
// 鎺ユ敹浼犲叆鍙傛暟锛氫氦鏄撹捣姝㈡棩鏈熴�佹敹閾跺憳ID
JSONArray array_paymentSums = new JSONArray();
Date timeStart = dateFormat.parse(vo.getTimeStart());
@@ -196,18 +202,34 @@
totalRefund = totalRefund + Optional.ofNullable(job_summary.getFloat("refundAmount")).orElse(0f);
}
- Map map_record = new HashMap();
- //map_record.put("itemTotal", itemTotal);
- map_record.put("list", list);
-
Map map_result = new HashMap();
map_result.put("totalCount", totalCount);
map_result.put("totalReceived", totalReceived);
map_result.put("totalGift", totalGift);
map_result.put("totalRefund", totalRefund);
+ // 鍒嗛〉鏍煎紡缁勮璁板綍鍒楄〃
+ Map map_record = new HashMap();
+ map_record.put("itemTotal", list.size());
+ map_record.put("pageCurr", pageCurr);
+ map_record.put("pageSize", pageSize);
+ map_record.put("pageTotal", (int)Math.ceil((double)list.size() / pageSize));
+ JSONArray array_record = (JSONArray) JSON.toJSON(list);
+ JSONArray array_record_page = (JSONArray)JSON.toJSON(array_record.subList(startIndex, Math.min(startIndex + pageSize, array_record.size())));
+ map_record.put("list", array_record_page);
+
+ // 鍒嗛〉鏍煎紡缁勮鏀粯鏂瑰紡鍒楄〃
+ Map map_paymentSums = new HashMap();
+ map_paymentSums.put("itemTotal", array_paymentSums.size());
+ map_paymentSums.put("pageCurr", pageCurr);
+ map_paymentSums.put("pageSize", pageSize);
+ map_paymentSums.put("pageTotal", (int)Math.ceil((double)array_paymentSums.size() / pageSize));
+ JSONArray array_paymentSums_page = (JSONArray) JSON.toJSON(array_paymentSums.subList(startIndex, Math.min(startIndex + pageSize, array_paymentSums.size())));
+ map_paymentSums.put("list", array_paymentSums_page);
+
+
map_result.put("records", map_record);
- map_result.put("paymentSums", array_paymentSums);
+ map_result.put("paymentSums", map_paymentSums);
return map_result;
}
--
Gitblit v1.8.0