From 4ee86eb0f4984bf3ede3196ad8c5fe95e8c5a504 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 19:05:02 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/bmo/customReport/InspectionStaffData.java | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/customReport/InspectionStaffData.java b/service-report/src/main/java/com/java110/report/bmo/customReport/InspectionStaffData.java
index fdecc63..a98db10 100644
--- a/service-report/src/main/java/com/java110/report/bmo/customReport/InspectionStaffData.java
+++ b/service-report/src/main/java/com/java110/report/bmo/customReport/InspectionStaffData.java
@@ -27,11 +27,8 @@
}
- public JSONObject execute(JSONObject params, IQueryServiceDAO queryServiceDAOImpl) {
-
+ public String execute(JSONObject params, IQueryServiceDAO queryServiceDAOImpl) {
JSONObject paramOut = new JSONObject();
- JSONArray th = new JSONArray();
- th.add("鍛樺伐");
List sqlParams = new ArrayList();
String sql = "select \n" +
@@ -96,38 +93,31 @@
List datas = queryServiceDAOImpl.executeSql(sql, sqlParams.toArray());
if (datas == null || datas.size() < 1) {
- paramOut.put("td", new JSONArray());
-
- return paramOut;
+ paramOut.put("toatl",1);
+ paramOut.put("data",new JSONArray());
+ return paramOut.toJSONString();
}
JSONArray tds = new JSONArray();
JSONObject td = null;
- for (int dataIndex = 0 ; dataIndex < datas.size() ; dataIndex ++ ){
- Map dataObj = (Map)datas.get(dataIndex);
+ for (int dataIndex = 0; dataIndex < datas.size(); dataIndex++) {
+ Map dataObj = (Map) datas.get(dataIndex);
td = hasInTd(tds, dataObj);
if (td == null) {
- td = new JSONObject();
+ td = new JSONObject(true);
td.put("鍛樺伐", dataObj.get("鍛樺伐"));
tds.add(td);
}
td.put(dataObj.get("宸℃鐐�").toString(), dataObj.get("宸插贰妫�") + "/" + dataObj.get("鏈贰妫�"));
- td.put("鐘舵��", dataObj.get("鐘舵��"));
+ td.put(dataObj.get("宸℃鐐�").toString()+"鐘舵��", dataObj.get("鐘舵��"));
}
- for (String key : tds.getJSONObject(0).keySet()) {
- if ("鍛樺伐".equals(key)) {
- continue;
- }
- th.add(key);
- }
+ paramOut.put("total",params.get("row"));
+ paramOut.put("data",tds);
-
- paramOut.put("th", th);
- paramOut.put("td", tds);
- return paramOut;
+ return paramOut.toJSONString();
}
--
Gitblit v1.8.0