bug修复

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -84,5 +84,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     List<OrderGoods> getOrderGoodsListByOrderNoAndStatus(String orderNo);
 
-    List<OrderGoodsAPPVO> getCancelOrderGoods(List<OrderGoodsTruckBind> list);
+    List<OrderGoodsAPPVO> getCancelOrderGoods(List<String> list);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -224,7 +224,7 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public List<OrderGoodsAPPVO> getCancelOrderGoods(List<OrderGoodsTruckBind> param) {
+    public List<OrderGoodsAPPVO> getCancelOrderGoods(List<String> param) {
         return baseMapper.getCancelOrderGoods(param);
     }
 

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -81,5 +81,5 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value = "residueWeight") BigDecimal residueWeight,@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "status") Integer status,@Param(value = "id") Integer id);
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getCancelOrderGoods")
-    List<OrderGoodsAPPVO> getCancelOrderGoods(@Param(value = "param") List<OrderGoodsTruckBind> param);
+    List<OrderGoodsAPPVO> getCancelOrderGoods(@Param(value = "param") List<String> param);
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsTruckBindServiceImpl.java

@@ -62,7 +62,7 @@ public class OrderGoodsTruckBindServiceImpl implements OrderGoodsTruckBindServic
             return null;
         }
 
-        return orderGoodsDao.getCancelOrderGoods(list);
+        return orderGoodsDao.getCancelOrderGoods(list.stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList()));
     }
 
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -256,8 +256,10 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
-    public String getCancelOrderGoods(@Param("param") PageOrderGoodsListParam param) {
-        String sql = " select a.id, a.order_no," +
+    public String getCancelOrderGoods(@Param("param") List<String> param) {
+        StringBuffer sqlList = new StringBuffer();
+
+        sqlList.append(" select a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
                     " if(a.residue_transport_weight < 0, '0', a.residue_transport_weight) as residue_transport_weight ,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
                     " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
@@ -269,11 +271,18 @@ public class OrderGoodsSqlProvider {
                     " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
                     "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
                     "a.user_no,a.user_name,a.stop_flag,a.batch_number,a.last_arrive_receive_time,a.last_load_time,a.last_order_time,a.vehicle_usage,ab.truck_no as truckNo"
-                + "from order_goods a left join order_goods_truck_bind ab on ab.order_goods_no = a.order_goods_no"
-                ;
+                + " from order_goods a left join order_goods_truck_bind ab on ab.order_goods_no = a.order_goods_no where ab.truck_no in (");
 
-
-        return sql;
+        if (!param.isEmpty()) {
+            for (int i = 0; i < param.size(); i++) {
+                sqlList.append("'" + param.get(i) + "'");
+                if (i < param.size() -1) {
+                    sqlList.append(",");
+                }
+            }
+        }
+        sqlList.append(") order by ab.create_time desc");
+        return sqlList.toString();
     }