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 432fb82..6c9113f 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 @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.system; import java.io.IOException; import java.util.List; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.ruoyi.jarvis.domain.OrderRows; @@ -39,9 +40,34 @@ public class JDOrderListController extends BaseController * 查询JD订单列表 */ @org.springframework.web.bind.annotation.GetMapping("/list") - public TableDataInfo list(JDOrder query) { + public TableDataInfo list(JDOrder query, HttpServletRequest request) { startPage(); - java.util.List list = jdOrderService.selectJDOrderList(query); + + // 处理排序参数 + String orderBy = request.getParameter("orderBy"); + String isAsc = request.getParameter("isAsc"); + + // 处理时间筛选参数 + String beginTimeStr = request.getParameter("beginTime"); + String endTimeStr = request.getParameter("endTime"); + + if (beginTimeStr != null && !beginTimeStr.isEmpty()) { + query.getParams().put("beginTime", beginTimeStr); + } + if (endTimeStr != null && !endTimeStr.isEmpty()) { + query.getParams().put("endTime", endTimeStr); + } + + java.util.List list; + if (orderBy != null && !orderBy.isEmpty()) { + // 设置排序参数 + query.getParams().put("orderBy", orderBy); + query.getParams().put("isAsc", isAsc); + list = jdOrderService.selectJDOrderListWithSort(query); + } else { + list = jdOrderService.selectJDOrderList(query); + } + TableDataInfo dataTable = getDataTable(list); List rows = (List) dataTable.getRows(); for (JDOrder jdOrder : rows) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java index 9547f89..1072f6b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java @@ -13,6 +13,11 @@ public interface JDOrderMapper { */ List selectJDOrderList(JDOrder jdOrder); + /** + * 查询京东订单列表(支持动态排序) + */ + List selectJDOrderListWithSort(JDOrder jdOrder); + /** * 根据主键查询 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java index 20c00e9..170a438 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java @@ -12,6 +12,11 @@ public interface IJDOrderService { */ List selectJDOrderList(JDOrder jdOrder); + /** + * 查询列表(支持动态排序) + */ + List selectJDOrderListWithSort(JDOrder jdOrder); + /** * 按ID查询 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java index 19e4ac9..38efabc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java @@ -19,6 +19,11 @@ public class JDOrderServiceImpl implements IJDOrderService { return jdOrderMapper.selectJDOrderList(jdOrder); } + @Override + public List selectJDOrderListWithSort(JDOrder jdOrder) { + return jdOrderMapper.selectJDOrderListWithSort(jdOrder); + } + @Override public JDOrder selectJDOrderById(Long id) { return jdOrderMapper.selectJDOrderById(id); diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml index f2c8dc2..e390948 100644 --- a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml @@ -42,13 +42,47 @@ and order_time = #{orderTime} and status like concat('%', #{status}, '%') - and order_time >= #{params.beginTime} + and date(order_time) >= #{params.beginTime} - and order_time <= #{params.endTime} + and date(order_time) <= #{params.endTime} - order by order_time desc, id desc + order by create_time desc, remark asc, id desc + + +