From 5abcde36961125cbf436f91b8c17610a6b5f8308 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 15 四月 2026 12:15:08 +0800
Subject: [PATCH] 修改调度单必填校验
---
api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java b/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
index d385490..65413f8 100644
--- a/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
+++ b/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
@@ -6,10 +6,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.PdfTemplateUtil;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.framework.config.ServerConfig;
@@ -57,6 +54,9 @@
@Value("${custom.upload.network-path}")
private String networkPath;
+ @Autowired
+ OssUtils ossUtils;
+
/**
* 鐧诲綍鏂规硶[pda]
@@ -87,7 +87,10 @@
* @return
*/
@GetMapping("/assignedItineraryLogList")
- public AjaxResult assignedItineraryLogList(){
+ public AjaxResult assignedItineraryLogList(Integer pageNum, Integer pageSize){
+ if (pageNum != null && pageSize != null) {
+ return AjaxResult.success(tmsDispatchOrderService.assignedItineraryLogListPage(pageNum, pageSize));
+ }
return tmsDispatchOrderService.assignedItineraryLogList();
}
@@ -100,7 +103,7 @@
}
/**
- * 琛岀▼鍘嗗彶
+ * 琛岀▼鍘嗗彶锛堟棫鎺ュ彛锛屼繚鎸佸吋瀹癸級
*/
@GetMapping("/tmsTripList/{dispatchId}")
public AjaxResult tmsTripList(@PathVariable Integer dispatchId){
@@ -108,11 +111,25 @@
}
/**
+ * 琛岀▼鍘嗗彶锛堝垎椤碉紝鎸夋椂闂村�掑簭锛宒ispatchId 鍙�� - 涓嶄紶鏌ュ叏閮級
+ */
+ @GetMapping("/tmsTripListPage")
+ public AjaxResult tmsTripListPage(Integer dispatchId, Integer pageNum, Integer pageSize){
+ if (pageNum == null) pageNum = 1;
+ if (pageSize == null) pageSize = 10;
+ return AjaxResult.success(tmsTripService.tmsTripListPage(dispatchId, pageNum, pageSize));
+ }
+
+ /**
* 鑾峰彇鍨粯鍒楄〃
* @return
*/
@GetMapping("/getTmsFinanceDetailList")
- public AjaxResult getTmsFinanceDetailList(Integer dispatchId){
+ public AjaxResult getTmsFinanceDetailList(Integer dispatchId, Integer pageNum, Integer pageSize){
+ // 浼犱簡鍒嗛〉鍙傛暟璧板垎椤碉紝鍚﹀垯鍏煎鏃ч�昏緫
+ if (pageNum != null && pageSize != null) {
+ return AjaxResult.success(tmsFinanceDetailService.getTmsFinanceDetailListPage(dispatchId, pageNum, pageSize));
+ }
return AjaxResult.success(tmsFinanceDetailService.getTmsFinanceDetailList(dispatchId));
}
@@ -196,5 +213,9 @@
return AjaxResult.success(data);
}
+ @GetMapping("/getOssToken")
+ public AjaxResult getOssToken(){
+ return AjaxResult.success(ossUtils.getToken());
+ }
}
--
Gitblit v1.8.0