1

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -315,9 +315,12 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     public PageResult<OrderMainDto> getOrderPage(OrderMainReq req) {
         Page<OrderMain> page = new Page<>();
         //排序字段处理，将驼峰改成和数据库同步的字段名
-        Map<String, String> orderSort = getOrderSort(req.getColumn(), req.getOrder());
-        req.setColumn(orderSort.get("column"));
-        req.setOrder(orderSort.get("order"));
+        if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
+                (req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) && !req.getOrder().trim().isEmpty()) {
+            //修改字段，和数据库字段进行统一
+            req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
+            req.setOrder(req.getOrder().toLowerCase());
+        }
         //根据查询条件得到单据
         IPage<OrderMain> outOrderPage = orderMainMapper.getOrderPage(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()),req);
         page.setRecords(outOrderPage.getRecords());
@@ -347,18 +350,21 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         //排序字段处理，将驼峰改成和数据库同步的字段名
         //将详细信息存入列表属性中
         //通过任务单id查询对应的详细信息
-        if (ObjectUtil.isEmpty(req.getColumn()) && ObjectUtil.isEmpty(req.getOrder())) {
+        if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
+                (req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) && !req.getOrder().trim().isEmpty()) {
+            //修改字段，和数据库字段进行统一
+            req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
+//            list=orderDetailService.list(new LambdaQueryWrapper<OrderDetail>()
+//                    .eq(OrderDetail::getOrderId, req.getId())
+//                    .orderBy(true,OrderItem.asc())
+//                    .orderBy(true);
+
+
+        } else {
+
             list = orderDetailService.list(new LambdaQueryWrapper<OrderDetail>()
                     .eq(OrderDetail::getOrderId, req.getId())
                     .orderByDesc(OrderDetail::getCreateTime));
-        } else {
-            Map<String, String> orderSort = getOrderSort(req.getColumn(), req.getOrder());
-            req.setColumn(orderSort.get("column"));
-            req.setOrder(orderSort.get("order"));
-//            list=orderDetailService.list(new LambdaQueryWrapper<OrderDetail>()
-//                    .eq(OrderDetail::getOrderId, req.getId())
-//                    .orderBy(true, StringUtils.isNotEmpty(req.getColumn()),
-//                            OrderItem.desc(req.getColumn()).withOrder("desc".equalsIgnoreCase(req.getOrder()) ? OrderItem.desc() : OrderItem.asc())));
         }
         List<OrderDetailDto> orderDetailDtoList=new ArrayList<>();
         for (OrderDetail orderDetail:list) {
@@ -615,19 +621,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
     }
 
-    //排序字段处理，将驼峰改成和数据库同步的字段名
-    public Map<String,String> getOrderSort(String column,String order){
-        Map<String,String> map=new HashMap<>();
-        //排序字段处理，将驼峰改成和数据库同步的字段名
-        if (ObjectUtil.isNotNull(column) && !column.trim().isEmpty() &&
-                (order.equalsIgnoreCase("asc")|| order.equalsIgnoreCase("desc")) && !order.trim().isEmpty()){
-            //修改字段，和数据库字段进行统一
-            column=column.replaceAll("[A-Z]", "_$0").toLowerCase();
-            order=order.toLowerCase();
-        }
-        map.put("column",column);
-        map.put("order",order);
-        return map;
-    }
+
 
 }