From fc1090ef8e44e8cf010c3d352482d78d389ba4c8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 11 五月 2022 15:52:02 +0800
Subject: [PATCH] 雨花代码
---
java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java | 4 ++--
service-report/src/main/java/com/java110/report/bmo/customReport/InspectionStaffData.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java b/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
index 9e3f359..ee69e8d 100755
--- a/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
+++ b/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
@@ -353,8 +353,8 @@
//JSONObject params = dataQuery.getRequestParams();
Interpreter interpreter = new Interpreter();
interpreter.eval(javaCode);
- interpreter.set("params", params);
- interpreter.set("queryServiceDAOImpl",queryServiceDAOImpl);
+ interpreter.set("params", new Object[]{params,queryServiceDAOImpl});
+ //interpreter.set("queryServiceDAOImpl",queryServiceDAOImpl);
return JSONObject.parseObject(interpreter.eval("execute(params,queryServiceDAOImpl)").toString());
} catch (Exception e) {
logger.error("鏁版嵁浜や簰寮傚父锛�", e);
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 c47aaf2..fdecc63 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
@@ -10,7 +10,7 @@
public class InspectionStaffData implements ReportExecute {
- public JSONObject hasInTd(JSONArray tds, Map<String, Object> dataObj) {
+ public JSONObject hasInTd(JSONArray tds, Map dataObj) {
if (tds == null || tds.size() < 1) {
return null;
@@ -27,7 +27,6 @@
}
- @Override
public JSONObject execute(JSONObject params, IQueryServiceDAO queryServiceDAOImpl) {
JSONObject paramOut = new JSONObject();
@@ -94,7 +93,7 @@
sql += "GROUP BY t.staff_name ,ipo.inspection_name";
- List<Map<String, Object>> datas = queryServiceDAOImpl.executeSql(sql, sqlParams.toArray());
+ List datas = queryServiceDAOImpl.executeSql(sql, sqlParams.toArray());
if (datas == null || datas.size() < 1) {
paramOut.put("td", new JSONArray());
@@ -104,7 +103,8 @@
JSONArray tds = new JSONArray();
JSONObject td = null;
- for (Map<String, Object> dataObj : datas) {
+ for (int dataIndex = 0 ; dataIndex < datas.size() ; dataIndex ++ ){
+ Map dataObj = (Map)datas.get(dataIndex);
td = hasInTd(tds, dataObj);
if (td == null) {
--
Gitblit v1.8.0