From 5d167ea6e943dd1574e0e6ed70ff25b8d4830f61 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 16 六月 2022 11:47:49 +0800
Subject: [PATCH] 优化代码

---
 service-report/src/main/java/com/java110/report/bmo/customReport/InspectionStaffData.java |    7 +++----
 1 files changed, 3 insertions(+), 4 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 47c6e69..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,9 +27,8 @@
 
     }
 
-    public String execute(String paramStr, IQueryServiceDAO queryServiceDAOImpl) {
+    public String execute(JSONObject params, IQueryServiceDAO queryServiceDAOImpl) {
         JSONObject paramOut = new JSONObject();
-        JSONObject params = JSONObject.parseObject(paramStr);
 
         List sqlParams = new ArrayList();
         String sql = "select \n" +
@@ -106,13 +105,13 @@
             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("鐘舵��"));
         }
 
         paramOut.put("total",params.get("row"));

--
Gitblit v1.8.0