From 7299282e6d9bfb7cf008477c2af888b3930bd716 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 20 二月 2025 10:46:49 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index fe28832..8f7f771 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -16,7 +17,6 @@
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StopWatch;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -199,10 +199,15 @@
Object o = param.get("orderType");
if (o != null) {
String[] split = o.toString().split(",");
- wrapper.in("source", split);
+ //-1璇存槑鏄崐鎴愬搧绠卞３鍑哄簱鍗�
+ if (split[0].equals("-1")) {
+ wrapper.like("order_no", "EB", SqlLike.RIGHT);
+ wrapper.in("source", split);
+ } else {
+ wrapper.in("source", split);
+ }
param.remove("orderType");
}
-
convertLike(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
--
Gitblit v1.9.1