1.大屏业务模块详情提交

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubServiceImpl.java

@@ -355,6 +355,10 @@ public class DPSubServiceImpl {
                         relation += !value.equals(fieldvalue);
                     } else if (condition.equals("equal")) {
                         relation += value.equals(fieldvalue);
+                    } else if (condition.equals("inList")){
+                        relation += value.contains(fieldvalue+"");
+                    } else if (condition.equals("unList")) {
+                        relation += !value.contains(fieldvalue+"");
                     }
                     relation += relationMap.getOrDefault(conditionObj.getString("relation"),"");
                 }
@@ -504,7 +508,7 @@ public class DPSubServiceImpl {
         Object displayName = JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.title");
         subObj.put("displayName", displayName);
         subObj.put("renderType", "basic");
-        subObj.put("columns", columnsArray.size());
+        subObj.put("columns", columnsArray.size()> 4 ? 4 : columnsArray.size());
 
         JSONArray datas = new JSONArray();
         mergedArray.stream().forEach(x -> {
@@ -628,7 +632,7 @@ public class DPSubServiceImpl {
                 }
             } else if ("attachmentUpload".equals(xObj.getString("componentKey"))) {
                 JSONArray attachmentUploadDatas = matinfo.getJSONArray("datas");
-                if (!ValidationUtil.isEmpty(value)) {
+                if (!ValidationUtil.isEmpty(value) && "null".equals(value)) {
                     JSONObject attachmentUploadDatasObj = new JSONObject();
                     log.info("附件数据：{}", value);
                     ((JSONArray)value).stream().forEach(y -> {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_gz.json

@@ -11,7 +11,7 @@
           "httpMethod":"GET",
           "apiPath":"/jg/jg-change-registration-reform/getDetail",
           "params": {
-            "sequenceNbr": "{sequenceNbr}"
+            "currentDocumentId": "{sequenceNbr}"
           },
           "ruleData": {
             "responseSuccess": "data.result"