luxiaotao1123
2023-12-30 f28b3a9131d2313a889f4a3156dcfabcefce7a84
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
@@ -43,8 +43,14 @@
        }
        if (!Cools.isEmpty(timeRange)) {
            String[] range = timeRange.split(RANGE_TIME_LINK);
            wrapper.ge(WrkMast::getAppeTime, DateUtils.convert(range[0]));
            wrapper.le(WrkMast::getAppeTime, DateUtils.convert(range[1]));
            wrapper.ge(WrkMast::getIoTime, DateUtils.convert(range[0]));
            wrapper.le(WrkMast::getIoTime, DateUtils.convert(range[1]));
        }
        if (!Cools.isEmpty(param.get("wrk_no"))) {
            wrapper.eq(WrkMast::getWrkNo, param.get("wrk_no"));
        }
        if (!Cools.isEmpty(param.get("wrk_sts"))) {
            wrapper.eq(WrkMast::getWrkSts, param.get("wrk_sts"));
        }
        return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
    }