Merge branch 'v6.4_transportation_20231110' into test

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

@@ -79,7 +79,7 @@ public class IntegralTruckDaoImpl extends BaseDaoImpl<IntegralTruckMapper, Integ
 
     @Override
     public IPage<IntegralTruckVO> driverPageTruckRank(DriverPageIntegralTruckRankParam param) {
-        return baseMapper.pageTruckRank(Page.of(param.getPage(), param.getPageSize()));
+        return baseMapper.driverPageTruckRank(Page.of(param.getPage(), param.getPageSize()), param);
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.IntegralTruck;
+import com.clx.performance.param.app.integral.DriverPageIntegralTruckRankParam;
 import com.clx.performance.param.pc.PageIntegralTruckParam;
 import com.clx.performance.param.pc.PageIntegralTruckRankParam;
 import com.clx.performance.sqlProvider.IntegralTruckSqlProvider;
@@ -41,4 +42,10 @@ public interface IntegralTruckMapper extends BaseMapper<IntegralTruck> {
     @SelectProvider(type = IntegralTruckSqlProvider.class, method = "pageTruckRank")
     IPage<IntegralTruckVO> pageTruckRank(@Param("page") Page<IntegralTruckVO> page);
 
+    /**
+     * @see IntegralTruckSqlProvider#driverPageTruckRank(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.integral.DriverPageIntegralTruckRankParam)
+     */
+    @SelectProvider(type = IntegralTruckSqlProvider.class, method = "driverPageTruckRank")
+    IPage<IntegralTruckVO> driverPageTruckRank(@Param("page") Page<IntegralTruckVO> page, @Param("param")DriverPageIntegralTruckRankParam param);
+
 }
\ No newline at end of file

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

 package com.clx.performance.sqlProvider;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.integral.DriverPageIntegralTruckRankParam;
 import com.clx.performance.param.pc.PageIntegralTruckParam;
 import com.clx.performance.param.pc.PageIntegralTruckRankParam;
 import com.clx.performance.vo.pc.IntegralTruckVO;
@@ -49,4 +50,21 @@ public class IntegralTruckSqlProvider {
         }}.toString();
     }
 
+    public String driverPageTruckRank(@Param("page") Page<IntegralTruckVO> page, @Param("param")DriverPageIntegralTruckRankParam param) {
+        return new SQL(){{
+
+            SELECT(" id, truck_no, " +
+                    " driver_name, driver_mobile, " +
+                    " echelon, integral, rank, " +
+                    " date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
+                    " date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime ");
+
+            FROM("integral_truck");
+
+            WHERE("truck_no in ("+ StringUtils.join(param.getTruckNoList(), ",") +") ");
+
+            ORDER_BY("integral desc, create_time desc");
+        }}.toString();
+    }
+
 }

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

@@ -147,8 +147,8 @@ public class OrderGoodsSqlProvider {
 
         sqlList.append("INSERT INTO order_goods(extract_weight,residue_transport_weight,already_transport_weight,loss_price,truck_demand,extract_way," +
                 "need_truck_num,vehicle_usage,pending_order_way,pending_order_time,pending_order_freight,last_arrive_send_time,senior_logistics_manager_id," +
-                "senior_logistics_manager_name,order_no,order_goods_no,order_goods_status,send_address_id,send_address_shorter,send_longitude," +
-                "send_latitude,receive_latitude,receive_longitude,receive_address_id,receive_address_shorter,goods_name,goods_id,create_time,modified_time," +
+                "senior_logistics_manager_name,order_no,order_goods_no,order_goods_status,send_address_id,send_address_shorter,send_system_address_id,,send_longitude," +
+                "send_latitude,receive_latitude,receive_longitude,receive_address_id,receive_address_shorter,receive_system_address_id,goods_name,goods_id,create_time,modified_time," +
                 "user_name,user_no,batch_number,last_arrive_receive_time,last_load_time,last_order_time,settlement_account_period,settlement_way) VALUES ");
 
         for (int i = 0; i < orderGoodsList.size(); i++) {
@@ -159,9 +159,9 @@ public class OrderGoodsSqlProvider {
                     .append(o.getNeedTruckNum()).append("','").append(o.getVehicleUsage()).append("','").append(o.getPendingOrderWay()).append("','").append(o.getPendingOrderTime()).append("','")
                     .append(o.getPendingOrderFreight()).append("','").append(o.getLastArriveSendTime()).append("','").append(o.getSeniorLogisticsManagerId()).append("','")
                     .append(o.getSeniorLogisticsManagerName()).append("','").append(o.getOrderNo()).append("','").append(o.getOrderGoodsNo()).append("','")
-                    .append(o.getOrderGoodsStatus()).append("','").append(o.getSendAddressId()).append("','").append(o.getSendAddressShorter()).append("','")
+                    .append(o.getOrderGoodsStatus()).append("','").append(o.getSendAddressId()).append("','").append(o.getSendAddressShorter()).append("','").append(o.getSendSystemAddressId()).append("','")
                     .append(o.getSendLongitude()).append("','").append(o.getSendLatitude()).append("','").append(o.getReceiveLatitude()).append("','").append(o.getReceiveLongitude()).append("','")
-                    .append(o.getReceiveAddressId()).append("','").append(o.getReceiveAddressShorter()).append("','").append(o.getGoodsName()).append("','")
+                    .append(o.getReceiveAddressId()).append("','").append(o.getReceiveAddressShorter()).append("','").append(o.getReceiveSystemAddressId()).append("','").append(o.getGoodsName()).append("','")
                     .append(o.getGoodsId()).append("','").append(o.getCreateTime()).append("','").append(o.getModifiedTime()).append("','").append(o.getUserName()).append("','")
                     .append(o.getUserNo()).append("','").append(o.getBatchNumber()).append("','").append(o.getLastArriveReceiveTime()).append("','")
                     .append(o.getLastLoadTime()).append("','").append(o.getLastOrderTime()).append("','").append(o.getSettlementAccountPeriod()).append("','").append(o.getSettlementWay())