#
Junjie
1 天以前 2d2fd991826837d7189cc488aee6f309a6f5e216
src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -59,15 +59,16 @@
    private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            String column = humpToLine(entry.getKey());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
                wrapper.ge(column, DateUtils.convert(dates[0]));
                wrapper.le(column, DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("manu_type")) {
                    wrapper.like(entry.getKey(), val);
                if ("manu_type".equals(column)) {
                    wrapper.like(column, val);
                } else {
                    wrapper.eq(entry.getKey(), val);
                    wrapper.eq(column, val);
                }
            }
        }