#

Junjie

2025-02-14 ac4341ea6b66ae02427d39d35f41d42d78b2eb2e

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/PageParam.java

@@ -80,6 +80,9 @@
        Map<String, Object> map = where.getMap();
        for (String key : map.keySet()) {
            Object val = map.get(key);
            if (val == null) {
                continue;
            }

            if (key.contains("Range")) {
                ArrayList<String> list = null;
@@ -94,6 +97,23 @@
                    queryWrapper.ge(key, DateUtils.convert(list.get(0)));
                    queryWrapper.le(key, DateUtils.convert(list.get(1)));
                }
            } else if (key.equals("_param")) {
                Map param = (Map) val;
                for (Object value : param.entrySet()) {
                    Map.Entry entry = (Map.Entry) value;
                    String paramKey = entry.getKey().toString();
                    if (this.isToUnderlineCase) {
                        paramKey = Utils.toSymbolCase(paramKey, '_');
                    }
                    if (!Cools.isEmpty(entry.getValue())) {
                        queryWrapper.like(paramKey, entry.getValue());
                    }
                }
            } else if (val instanceof List) {
                if (this.isToUnderlineCase) {
                    key = Utils.toSymbolCase(key, '_');
                }
                queryWrapper.in(key, (List) val);
            } else {
                if (this.isToUnderlineCase) {
                    key = Utils.toSymbolCase(key, '_');
@@ -115,7 +135,9 @@
        if (!Cools.isEmpty(cls)) {
            fields = Cools.getAllFields(cls);
            for (Field field : fields) {
                if ("createTime".equals(field.getName())) {
                if ("id".equals(field.getName())) {
                    queryWrapper.orderByDesc("id");
                } else if ("createTime".equals(field.getName())) {
                    queryWrapper.orderByDesc(Utils.toSymbolCase(field.getName(), '_'));
                }
            }