1

zhang

3 天以前 5dff87c18f48e0a14440d1225924d35f8de7b00e

1

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

@@ -251,6 +251,7 @@
            }
            param.remove("orderType");
        }
        wrapper.andNew();
        convert(param, wrapper);
//        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
//        List<Long> docIds = new ArrayList<>();
@@ -259,7 +260,9 @@
//                docIds.add(pakin.getDocId());
//            }
//        }
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
        Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);

        return R.ok(orderDetlPage);
    }



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

@@ -236,6 +236,7 @@
            }
            param.remove("orderType");
        }
        wrapper.andNew();
        convertLike(param, wrapper);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));