1

zc

2025-09-10 65c305f9e8af6fdb4f80b85484b1170f068aa1fa

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

@@ -8,13 +8,8 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;

import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -72,7 +67,7 @@
    }

    @RequestMapping(value = "/order/head/page/auth")
    @ManagerAuth
    //@ManagerAuth
    public R head(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
@@ -80,6 +75,11 @@
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        String temp = (String) param.get("temp");
        if (temp != null) {
            wrapper.where("(temp1 like '%"+temp+"%' or temp2 like '%"+temp+"%')");
            param.remove("temp");
        }
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("settle").orderBy("create_time", false);