优化 Java框架 更加优雅

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

@@ -354,7 +354,7 @@ public class QueryServiceSMOImpl extends LoggerEngine implements IQueryServiceSM
             List<String> columns = new ArrayList<>();
             Interpreter interpreter = new Interpreter();
             interpreter.eval(javaCode);
-            interpreter.set("params", params.toJSONString());
+            interpreter.set("params", params);
             interpreter.set("queryServiceDAOImpl",queryServiceDAOImpl);
             JSONObject results = JSONObject.parseObject(interpreter.eval("execute(params,queryServiceDAOImpl)").toString());
 

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

@@ -27,9 +27,8 @@ public class InspectionStaffData implements ReportExecute {
 
     }
 
-    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,7 +105,7 @@ public class InspectionStaffData implements ReportExecute {
             td = hasInTd(tds, dataObj);
 
             if (td == null) {
-                td = new JSONObject();
+                td = new JSONObject(true);
                 td.put("员工", dataObj.get("员工"));
                 tds.add(td);
             }

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 {
 
-    String execute(String params,IQueryServiceDAO queryServiceDAOImpl);
+    String execute(JSONObject params,IQueryServiceDAO queryServiceDAOImpl);
 }