wuxw před 4 roky
rodič
revize
7e275414b8

+ 2 - 2
java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java

@@ -353,8 +353,8 @@ public class QueryServiceSMOImpl extends LoggerEngine implements IQueryServiceSM
             //JSONObject params = dataQuery.getRequestParams();
             Interpreter interpreter = new Interpreter();
             interpreter.eval(javaCode);
-            interpreter.set("params", new Object[]{params,queryServiceDAOImpl});
-            //interpreter.set("queryServiceDAOImpl",queryServiceDAOImpl);
+            interpreter.set("params", params.toJSONString());
+            interpreter.set("queryServiceDAOImpl",queryServiceDAOImpl);
             return JSONObject.parseObject(interpreter.eval("execute(params,queryServiceDAOImpl)").toString());
         } catch (Exception e) {
             logger.error("数据交互异常:", e);

+ 3 - 1
service-report/src/main/java/com/java110/report/bmo/customReport/InspectionStaffData.java

@@ -27,7 +27,9 @@ public class InspectionStaffData implements ReportExecute {
 
     }
 
-    public JSONObject execute(JSONObject params, IQueryServiceDAO queryServiceDAOImpl) {
+    public JSONObject execute(String paramStr, IQueryServiceDAO queryServiceDAOImpl) {
+
+        JSONObject params = JSONObject.parseObject(paramStr);
 
         JSONObject paramOut = new JSONObject();
         JSONArray th = new JSONArray();

+ 1 - 1
service-report/src/main/java/com/java110/report/bmo/customReport/ReportExecute.java

@@ -6,5 +6,5 @@ import com.java110.service.context.DataQuery;
 
 public interface ReportExecute {
 
-    JSONObject execute(JSONObject params,IQueryServiceDAO queryServiceDAOImpl);
+    JSONObject execute(String params,IQueryServiceDAO queryServiceDAOImpl);
 }