#

Junjie

2024-09-26 ac45194a5ff830a0f355a76a202e1d4f1d15a35b

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

@@ -1,6 +1,7 @@
package com.zy.asrs.wms.asrs.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -14,6 +15,7 @@
import com.zy.asrs.wms.asrs.service.OrderLogService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
import com.zy.asrs.wms.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -48,21 +50,34 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<OrderLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderLog.class);
//        QueryWrapper<OrderLog> wrapper = pageParam.buildWrapper(true);
        LambdaQueryWrapper<OrderLog> wrapper = new LambdaQueryWrapper<>();
        QueryWrapper<OrderLog> wrapper = new QueryWrapper<>();

        ArrayList<Long> types = new ArrayList<>();
        for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 1))) {
            types.add(orderType.getId());
        }

        wrapper.in(OrderLog::getOrderType, types);
        wrapper.in("order_type", types);

        if (!Cools.isEmpty(condition)) {
            wrapper.and(wrapper1 -> {
                wrapper1.or().like(OrderLog::getOrderNo, condition);
                wrapper1.or().like(OrderLog::getMemo, condition);
                wrapper1.or().like("order_no", condition);
                wrapper1.or().like("memo", condition);
            });
        }

        Object paramObj = map.get("_param");
        if(paramObj != null) {
            Map param = (Map) paramObj;
            for (Object value : param.entrySet()) {
                Map.Entry entry = (Map.Entry) value;
                String paramKey = Utils.toSymbolCase(entry.getKey().toString(), '_');
                if (entry.getValue() != null) {
                    wrapper.like(paramKey, entry.getValue());
                }
            }
        }

        return R.ok().add(orderLogService.page(pageParam, wrapper));
    }

@@ -73,21 +88,34 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<OrderLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderLog.class);
//        QueryWrapper<OrderLog> wrapper = pageParam.buildWrapper(true);
        LambdaQueryWrapper<OrderLog> wrapper = new LambdaQueryWrapper<>();
        QueryWrapper<OrderLog> wrapper = new QueryWrapper<>();

        ArrayList<Long> types = new ArrayList<>();
        for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 2))) {
            types.add(orderType.getId());
        }

        wrapper.in(OrderLog::getOrderType, types);
        wrapper.in("order_type", types);

        if (!Cools.isEmpty(condition)) {
            wrapper.and(wrapper1 -> {
                wrapper1.or().like(OrderLog::getOrderNo, condition);
                wrapper1.or().like(OrderLog::getMemo, condition);
                wrapper1.or().like("order_no", condition);
                wrapper1.or().like("memo", condition);
            });
        }

        Object paramObj = map.get("_param");
        if(paramObj != null) {
            Map param = (Map) paramObj;
            for (Object value : param.entrySet()) {
                Map.Entry entry = (Map.Entry) value;
                String paramKey = Utils.toSymbolCase(entry.getKey().toString(), '_');
                if (entry.getValue() != null) {
                    wrapper.like(paramKey, entry.getValue());
                }
            }
        }

        return R.ok().add(orderLogService.page(pageParam, wrapper));
    }