diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java index ad553b8..e254112 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java @@ -119,11 +119,20 @@ public class TransportService extends BaseService { * @return */ public List inSupermarket(int supermarket_id) { - String sql = " select t.*, t.id transport_id " + - " from transport t \n" + - " where t.state < ? \n" + - " and t.supermarket_id = ? \n" + - " order by t.out_time desc "; + String sql = "SELECT\n" + + " t.*, t.id transport_id,\n" + + " r.req_receipt tp\n" + + "FROM\n" + + " `transport` t\n" + + "LEFT JOIN ordercluster_truck o ON t.truck_license = o.truck_license\n" + + "LEFT JOIN ordercluster r ON o.ordercluster_id = r.id\n" + + "WHERE\n" + + " t.state < ?\n" + + "AND t.supermarket_id = ?\n" + + "GROUP BY\n" + + " t.truck_license\n" + + "ORDER BY\n" + + " t.out_time DESC"; return Db.find(sql, OrderStateEnum.RECEIVED.getStateid(), supermarket_id); }