From c11e6f07b031eea6c7de4c5508b8dbf0ee01d2c7 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 01 四月 2026 10:08:08 +0800
Subject: [PATCH] 去除不同报价方案，不能添加相同【客户-路线-车型】数据
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java
index ba10b24..29ea620 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.*;
@@ -122,6 +123,34 @@
);
}
+ @Override
+ public Map<String, Object> tmsTripListPage(Integer dispatchId, Integer pageNum, Integer pageSize) {
+ Integer deviceId = userService.getDeviceId(SecurityUtils.getUserId());
+ if (deviceId == null) {
+ Map<String, Object> empty = new HashMap<>();
+ empty.put("rows", Collections.emptyList());
+ empty.put("total", 0);
+ return empty;
+ }
+
+ LambdaQueryWrapper<TmsTrip> wrapper = new LambdaQueryWrapper<TmsTrip>()
+ .eq(TmsTrip::getDriverId, deviceId);
+ // dispatchId 鍙�夛紝涓嶄紶鏃舵煡璇ュ徃鏈哄叏閮ㄨ绋�
+ if (dispatchId != null) {
+ wrapper.eq(TmsTrip::getDispatchOrderId, dispatchId);
+ }
+ // 鎸夎绋嬫椂闂村�掑簭
+ wrapper.orderByDesc(TmsTrip::getTripTime);
+
+ Page<TmsTrip> page = new Page<>(pageNum, pageSize);
+ Page<TmsTrip> result = tmsTripMapper.selectPage(page, wrapper);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("rows", result.getRecords());
+ map.put("total", result.getTotal());
+ return map;
+ }
+
/**
* 鏌ヨ琛岀▼鍒楄〃 寮傛 瀵煎嚭
*
@@ -204,10 +233,10 @@
asyncPdfService.generateTripPdfAsync(tmsTrip,tmsDispatchOrder,tmsDriver);
}
// 瀹屾垚韬綋妫�鏌�
- if (tmsTrip.getTripType() == 1){
+ if (tmsTrip.getTripType() == 1 && tmsDispatchOrder.getOperationMode() == 0){
// 娣诲姞 棰嗛挜鍖� 鎸囦护璁板綍
TmsVehicle tmsVehicle = tmsVehicleServiceImpl.selectTmsVehicleById(tmsDispatchOrder.getVehicleId());
-
+ logger.info("娣诲姞 棰嗛挜鍖� 鎸囦护璁板綍,{},{}",tmsDispatchOrder.getVehicleId(),tmsVehicle.getCarKeyNo());
TmsCarKeyDispatch tmsCarKeyDispatch = new TmsCarKeyDispatch();
tmsCarKeyDispatch.setDispatchOrderId(dispatchOrderId);
tmsCarKeyDispatch.setDispatchOrderNo(tmsDispatchOrder.getDispatchNo());
--
Gitblit v1.8.0