From 91fcd48801ad1120651027824f7a60a14deadf87 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 08 七月 2025 19:21:21 +0800
Subject: [PATCH] 修改三方对接逻辑和环境参数配置
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 5d27d19..98db265 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -87,7 +87,7 @@
@Autowired
private ITOrderTaxiService orderTaxiService;
- @Resource
+ @Autowired
private ShiroExtUtil shiroExtUtil;
@@ -570,30 +570,35 @@
for (int i = 0; i < mapList.size(); i++) {
Map<String,Object> d=mapList.get(i);
values[i] = new String[title.length];
- values[i][0]=d.get("insertTime").toString();
- values[i][1]=d.get("originalDriver").toString();
- values[i][2]=d.get("reason").toString();
- values[i][3]=d.get("orderNum").toString();
- values[i][4]=d.get("addOrderUser").toString();
- values[i][5]=d.get("travelTime").toString();
- values[i][6]=d.get("startAddress").toString();
- values[i][7]=d.get("endAddress").toString();
- values[i][8]=d.get("originalCar").toString();
- values[i][9]=d.get("money").toString();
- values[i][10]=d.get("nowDriver")==null?"":d.get("nowDriver").toString();
- values[i][11]=d.get("nowCar")==null?"":d.get("nowCar").toString();
- values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
- d.get("orderState").toString().equals("2")?"待出发":
- d.get("orderState").toString().equals("3")?"待到达预约地点":
- d.get("orderState").toString().equals("4")?"待取货":
- d.get("orderState").toString().equals("5")?"服务中":
- d.get("orderState").toString().equals("6")?"已送达":
- d.get("orderState").toString().equals("7")?"待支付":
- d.get("orderState").toString().equals("8")?"需补差价":
- d.get("orderState").toString().equals("9")?"已取货":
- d.get("orderState").toString().equals("10")?"已取消":
- d.get("orderState").toString().equals("11")?"改派中":
- d.get("orderState").toString().equals("12")?"已支付差价":"";
+ values[i][0]=null == d.get("insertTime") ? "" : d.get("insertTime").toString();
+ values[i][1]=null == d.get("originalDriver") ? "" : d.get("originalDriver").toString();
+ values[i][2]=null == d.get("reason") ? "" : d.get("reason").toString();
+ values[i][3]=null == d.get("orderNum") ? "" : d.get("orderNum").toString();
+ values[i][4]=null == d.get("addOrderUser") ? "" : d.get("addOrderUser").toString();
+ values[i][5]=null == d.get("travelTime") ? "" : d.get("travelTime").toString();
+ values[i][6]=null == d.get("startAddress") ? "" : d.get("startAddress").toString();
+ values[i][7]=null == d.get("endAddress") ? "" : d.get("endAddress").toString();
+ values[i][8]=null == d.get("originalCar") ? "" : d.get("originalCar").toString();
+ values[i][9]=null == d.get("money") ? "" : d.get("money").toString();
+ values[i][10]=null == d.get("nowDriver") ? "" : d.get("nowDriver").toString();
+ values[i][11]=null == d.get("nowCar") ? "" : d.get("nowCar").toString();
+ if(null == d.get("orderState")){
+ values[i][12]="";
+ }else{
+ values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
+ d.get("orderState").toString().equals("2")?"待出发":
+ d.get("orderState").toString().equals("3")?"待到达预约地点":
+ d.get("orderState").toString().equals("4")?"待取货":
+ d.get("orderState").toString().equals("5")?"服务中":
+ d.get("orderState").toString().equals("6")?"已送达":
+ d.get("orderState").toString().equals("7")?"待支付":
+ d.get("orderState").toString().equals("8")?"需补差价":
+ d.get("orderState").toString().equals("9")?"已取货":
+ d.get("orderState").toString().equals("10")?"已取消":
+ d.get("orderState").toString().equals("11")?"改派中":
+ d.get("orderState").toString().equals("12")?"已支付差价":"";
+ }
+
values[i][13]=d.get("state").toString().equals("1")?"提交申请":
d.get("state").toString().equals("2")?"已支付":
d.get("state").toString().equals("3")?"已改派":
--
Gitblit v1.7.1