#

zwl

1 天以前 8bc69dccd6683a7bf13bfbcfffd8fec9bd688887

 src/main/java/com/zy/asrs/controller/LocDetlController.java

@@ -189,6 +189,7 @@
//            }
//        }
        excludeTrash(param);
        applyBeBatchFilter(param, wrapper);
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
@@ -203,18 +204,42 @@
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            String key = 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(key, DateUtils.convert(dates[0]));
                wrapper.le(key, DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("locNo")) {
                if ("loc_no".equals(key)) {
                    wrapper.eq("loc_no", String.valueOf(entry.getValue()));
                } else {
                    wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                    wrapper.like(key, String.valueOf(entry.getValue()));
                }
            }
        }
    }

    private <T> void applyBeBatchFilter(Map<String, Object> map, EntityWrapper<T> wrapper) {
        Object beBatchObj = map.remove("beBatch");
        if (beBatchObj == null) {
            beBatchObj = map.remove("be_batch");
        }
        if (beBatchObj == null) {
            return;
        }
        String beBatch = String.valueOf(beBatchObj).trim();
        if (Cools.isEmpty(beBatch)) {
            return;
        }
        if ("1".equals(beBatch)) {
            wrapper.eq("be_batch", 1);
            return;
        }
        if ("0".equals(beBatch)) {
            wrapper.andNew().isNull("be_batch").or().eq("be_batch", 0);
            return;
        }
        wrapper.eq("be_batch", beBatch);
    }

    @RequestMapping(value = "/locDetl/add/auth")
@@ -290,6 +315,7 @@
                map.remove("row");
            }
        }
        applyBeBatchFilter(map, wrapper);
        convert(map, wrapper);
        if (!row.equals("")) {
            wrapper.and()