Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

2025-10-28 5cd9288f8ff95696ebbb88fa9c5a7f0322aeb699

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -1023,4 +1023,27 @@
        }
        return true;
    }

    public Map<String,Object> appGetOrderList(List<LocalDate> dates) {
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(30).toString();
        if(dates !=null && dates.size()==2){
            if(dates.get(0) != null){
                startDate = String.valueOf(dates.get(0));
            }
            if(dates.get(1) != null){
                endDate = String.valueOf(dates.get(1));
            }
        }
        List<Order> list = orderMapper.selectList(new LambdaQueryWrapper<Order>()
                .gt(Order::getCreateOrder,0)
                .between(Order::getCreateTime,startDate, endDate)
        );

        Map<String,Object> map = new HashMap<>();
        map.put("data",list);

        return map;
        //return orderMapper.
    }
}