修改bug

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/ConditionEnum.java

@@ -14,9 +14,9 @@ public enum ConditionEnum {
      * 类型枚举
      */
 
+    like("包含", "like", TechnicalParameter.ParamType.STRING),
+    notLike("不包含", "notLike", TechnicalParameter.ParamType.STRING),
     stringEq("等于", "eq", TechnicalParameter.ParamType.STRING),
-    like("匹配", "like", TechnicalParameter.ParamType.STRING),
-    notLike("不匹配", "notLike", TechnicalParameter.ParamType.STRING),
     numberEq("等于", "eq", TechnicalParameter.ParamType.BIG_DECIMAL),
     numberGt("大于", "gt", TechnicalParameter.ParamType.BIG_DECIMAL),
     numberLt("小于", "lt", TechnicalParameter.ParamType.BIG_DECIMAL),

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/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -732,6 +732,24 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             } else {
                 JSONArray leftGroup = filterParams.getJSONArray("group1");
                 JSONArray rightGroup = filterParams.getJSONArray("group2");
+                JSONArray equListCodes = new JSONArray();
+                leftGroup.forEach(item -> {
+                    JSONObject left = JSONObject.parseObject(JSONObject.toJSONString(item));
+                    String leftField = left.getString("field");
+                    String leftValue = left.getString("value");
+                    if (!ObjectUtils.isEmpty(leftField) && leftField.equals("EQU_LIST_CODE") && !ObjectUtils.isEmpty(leftValue)) {
+                        equListCodes.add(leftValue);
+                    }
+                });
+                rightGroup.forEach(item -> {
+                    JSONObject left = JSONObject.parseObject(JSONObject.toJSONString(item));
+                    String rightField = left.getString("field");
+                    String rightValue = left.getString("value");
+                    if (!ObjectUtils.isEmpty(rightField) && rightField.equals("EQU_LIST_CODE") && !ObjectUtils.isEmpty(rightValue)) {
+                        equListCodes.add(rightValue);
+                    }
+                });
+                filterParams.put("EQU_LIST", equListCodes);
                 Boolean isOrGroup = or.equals(filterParams.getString("groupAndOr")) ? Boolean.TRUE : Boolean.FALSE;
                 handleAdvancedFilter(boolMust, leftGroup, rightGroup, isOrGroup);
             }