#

Junjie

2024-01-11 901b2ab3e0e7c592602848cfa256f34c5b0c7bb8

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java

@@ -37,7 +37,7 @@
                  @RequestParam(required = false) String timeRange,
                  @RequestParam Map<String, Object> param) {
        LambdaQueryWrapper<WrkMastLog> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(WrkMastLog::getHostId, getHostId());
//        wrapper.eq(WrkMastLog::getHostId, getHostId());
        if (!Cools.isEmpty(condition)) {
            wrapper.like(WrkMastLog::getWrkNo, condition);
        }
@@ -46,6 +46,18 @@
            wrapper.ge(WrkMastLog::getAppeTime, DateUtils.convert(range[0]));
            wrapper.le(WrkMastLog::getAppeTime, DateUtils.convert(range[1]));
        }
        if (!Cools.isEmpty(param.get("wrkNo"))) {
            wrapper.eq(WrkMastLog::getWrkNo, param.get("wrkNo"));
        }
        if (!Cools.isEmpty(param.get("wrkSts"))) {
            wrapper.eq(WrkMastLog::getWrkSts, param.get("wrkSts"));
        }
        if (!Cools.isEmpty(param.get("ioType"))) {
            wrapper.eq(WrkMastLog::getIoType, param.get("ioType"));
        }
        if (!Cools.isEmpty(param.get("manuType"))) {
            wrapper.like(WrkMastLog::getManuType, param.get("manuType"));
        }
        wrapper.orderByDesc(WrkMastLog::getId);
        return R.ok(wrkMastLogService.page(new Page<>(curr, limit), wrapper));
    }