#

Junjie

2023-12-26 6b454f93fe3383357bb17c700b9a94ed8dfffbc3

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

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.BasWrkIotype;
import com.zy.asrs.common.wms.entity.BasWrkStatus;
import com.zy.asrs.common.wms.service.BasWrkStatusService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -34,7 +35,8 @@
    public R page(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String condition,
                  @RequestParam(required = false) String timeRange) {
                  @RequestParam(required = false) String timeRange,
                  @RequestParam Map<String, Object> param) {
        LambdaQueryWrapper<BasWrkStatus> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(BasWrkStatus::getWrkDesc, condition);
@@ -44,6 +46,9 @@
            wrapper.ge(BasWrkStatus::getAppeTime, DateUtils.convert(range[0]));
            wrapper.le(BasWrkStatus::getAppeTime, DateUtils.convert(range[1]));
        }
        if (!Cools.isEmpty(param.get("wrk_sts"))) {
            wrapper.eq(BasWrkStatus::getWrkSts, param.get("wrk_sts"));
        }
        return R.ok(basWrkStatusService.page(new Page<>(curr, limit), wrapper));
    }