#

Junjie

2024-04-13 e9a4418c14ef68fb454300b092c413e8df259ec2

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

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.wcs.utils.Utils;
import com.zy.asrs.wcs.utils.CommonUtils;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -89,14 +89,14 @@
                if (null != list) {
                    key = key.replaceAll("Range", "");
                    if (this.isToUnderlineCase) {
                        key = Utils.toSymbolCase(key, '_');
                        key = CommonUtils.toSymbolCase(key, '_');
                    }
                    queryWrapper.ge(key, DateUtils.convert(list.get(0)));
                    queryWrapper.le(key, DateUtils.convert(list.get(1)));
                }
            } else {
                if (this.isToUnderlineCase) {
                    key = Utils.toSymbolCase(key, '_');
                    key = CommonUtils.toSymbolCase(key, '_');
                }
                if (like) {
                    queryWrapper.like(key, val);
@@ -116,7 +116,7 @@
            fields = Cools.getAllFields(cls);
            for (Field field : fields) {
                if ("createTime".equals(field.getName())) {
                    queryWrapper.orderByDesc(Utils.toSymbolCase(field.getName(), '_'));
                    queryWrapper.orderByDesc(CommonUtils.toSymbolCase(field.getName(), '_'));
                }
            }
        }
@@ -137,7 +137,7 @@
                    }
                }

                String column =  Utils.toSymbolCase(field.getName(), '_');
                String column =  CommonUtils.toSymbolCase(field.getName(), '_');
                columns.add(column);
            }
            if (!columns.isEmpty()) {
@@ -156,4 +156,18 @@
        return queryWrapper;
    }

    public Map<String, Object> pickOutMap() {
        return pickOutMap(false);
    }

    public Map<String, Object> pickOutMap(boolean mergeCondition) {
        Map<String, Object> map = where.getMap();
        if (mergeCondition) {
            if (!Cools.isEmpty(where.getCondition())) {
                map.put("condition", where.getCondition());
            }
        }
        return map;
    }

}