[update] 上次在途数据未获取到问题修复

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverGoodsLossIntervalMainMapper.java

@@ -7,6 +7,7 @@ import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalMain;
 import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -38,9 +39,9 @@ public interface DriverGoodsLossIntervalMainMapper extends BaseMapper<DriverGood
      * 查询指定运营商最后生成统计记录
      * @param operatorId 运营商id
      * @param warehouseId 仓库id
-     * @param intervalStartTime 区间开始时间
+     * @param intervalStartDate 区间开始时间
      * @return 司机货损统计记录
      */
-    DriverGoodsLossIntervalMain queryLastByOperatorId(@Param("operatorId") Long operatorId, @Param("warehouseId") Long warehouseId, @Param("intervalStartTime") LocalDateTime intervalStartTime);
+    DriverGoodsLossIntervalMain queryLastByOperatorId(@Param("operatorId") Long operatorId, @Param("warehouseId") Long warehouseId, @Param("intervalStartDate") LocalDate intervalStartDate);
 
 }

warehouse-admin-data/src/main/resources/mapper/driver/DriverGoodsLossIntervalMainMapper.xml

@@ -89,8 +89,8 @@
                                                         operatorId = #{operatorId}
                                                       and warehouseId = #{warehouseId}
                                                       and stockTakingType = 'REGULAR'
-                                                    and #{intervalStartTime} >= intervalEndTime
-        order by intervalEndTime desc limit 1
+                                                    and #{intervalStartDate} >= intervalEndTime
+        order by id desc limit 1
     </select>
 
 </mapper>

warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverGoodsLossIntervalServiceImpl.java

@@ -141,7 +141,7 @@ public class DriverGoodsLossIntervalServiceImpl implements DriverGoodsLossInterv
         List<DriverOnRouteDetailLog> driverOnRouteDetailLogs = driverOnRouteDetailLogMapper.searchByStatDate(bo.getAreaStaffIds(), bo.getEndStatDate());
 
         // 获取上一次司机的货损统计记录
-        DriverGoodsLossIntervalMain lastDriverGoodsLossIntervalMain = driverGoodsLossIntervalMainMapper.queryLastByOperatorId(bo.getOperatorId(), bo.getWarehouseId(), bo.getIntervalStartTime());
+        DriverGoodsLossIntervalMain lastDriverGoodsLossIntervalMain = driverGoodsLossIntervalMainMapper.queryLastByOperatorId(bo.getOperatorId(), bo.getWarehouseId(), bo.getIntervalStartTime().toLocalDate());
         List<DriverGoodsLossIntervalDetail> lastDriverGoodsLossIntervalDetails = null;
         List<EquipmentLossIntervalDetail> lastEquipmentLossIntervalDetails = null;
         if (null != lastDriverGoodsLossIntervalMain) {