diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java index cabfee7..d6244b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java @@ -125,6 +125,7 @@ public class JDOrderListController extends BaseController if (orderSearch != null && !orderSearch.trim().isEmpty()) { query.getParams().put("orderSearch", orderSearch.trim()); } + applyMobileQuickSearch(query, request); String quickRecordSearch = request.getParameter("quickRecordSearch"); if (quickRecordSearch != null && !quickRecordSearch.trim().isEmpty()) { @@ -314,10 +315,11 @@ public class JDOrderListController extends BaseController */ @Log(title = "JD订单", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, JDOrder jdOrder) throws IOException + public void export(HttpServletResponse response, JDOrder jdOrder, HttpServletRequest request) throws IOException { String fileName = "JD订单数据"; + applyMobileQuickSearch(jdOrder, request); applyModelNumberExcludeFilter(jdOrder); List list = jdOrderService.selectJDOrderList(jdOrder); @@ -601,6 +603,7 @@ public class JDOrderListController extends BaseController if (orderSearch != null && !orderSearch.trim().isEmpty()) { query.getParams().put("orderSearch", orderSearch.trim()); } + applyMobileQuickSearch(query, request); String rebateRemarkAbnormal = request.getParameter("rebateRemarkHasAbnormal"); if (rebateRemarkAbnormal != null && !rebateRemarkAbnormal.isEmpty()) { @@ -742,6 +745,17 @@ public class JDOrderListController extends BaseController /** * 型号不含:支持逗号、中文逗号、空格、换行分隔的多个关键词,型号不得包含任一关键词。 */ + /** 手机端快速搜索:备注、单号、下单人、地址任一命中即可 */ + private void applyMobileQuickSearch(JDOrder query, HttpServletRequest request) { + if (query == null || request == null) { + return; + } + String mobileQuickSearch = request.getParameter("mobileQuickSearch"); + if (mobileQuickSearch != null && !mobileQuickSearch.trim().isEmpty()) { + query.getParams().put("mobileQuickSearch", mobileQuickSearch.trim()); + } + } + private void applyModelNumberExcludeFilter(JDOrder query) { if (query == null) { return; diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml index df3299b..bb2749c 100644 --- a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml @@ -69,6 +69,17 @@ or waybill_no like concat('%', #{params.orderSearch}, '%') ) + + and ( + remark like concat('%', #{params.mobileQuickSearch}, '%') + or order_id like concat('%', #{params.mobileQuickSearch}, '%') + or third_party_order_no like concat('%', #{params.mobileQuickSearch}, '%') + or distribution_mark like concat('%', #{params.mobileQuickSearch}, '%') + or waybill_no like concat('%', #{params.mobileQuickSearch}, '%') + or buyer like concat('%', #{params.mobileQuickSearch}, '%') + or address like concat('%', #{params.mobileQuickSearch}, '%') + ) + and ( model_number like concat('%', #{params.quickRecordSearch}, '%') @@ -143,6 +154,17 @@ or waybill_no like concat('%', #{params.orderSearch}, '%') ) + + and ( + remark like concat('%', #{params.mobileQuickSearch}, '%') + or order_id like concat('%', #{params.mobileQuickSearch}, '%') + or third_party_order_no like concat('%', #{params.mobileQuickSearch}, '%') + or distribution_mark like concat('%', #{params.mobileQuickSearch}, '%') + or waybill_no like concat('%', #{params.mobileQuickSearch}, '%') + or buyer like concat('%', #{params.mobileQuickSearch}, '%') + or address like concat('%', #{params.mobileQuickSearch}, '%') + ) + and ( model_number like concat('%', #{params.quickRecordSearch}, '%')