From e9d0eb5d4f43c3cd5a37283151d69683b3ddd6bf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 02 九月 2025 15:05:10 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 42e4878..b159b28 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
@@ -263,15 +263,15 @@
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("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("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")?"已支付差价":"";
+ d.get("orderState").toString().equals("12")?"取消待支付":"";
}
if(null == d.get("state")){
values[i][13]="";
@@ -344,7 +344,7 @@
Date date = new Date();
DateFormat format = new SimpleDateFormat("yyyyMMdd");
String time = format.format(date);
- String fileName = "快车改派"+time+".xls";
+ String fileName = "跨城改派"+time+".xls";
String[] title = new String[] {"申请改派时间","申请司机","申请原因","订单编号","下单用户","出发时间","出发地","目的地"
,"原服务车辆","改派处罚金","改派服务司机","改派服务车辆","订单当前状态","改派状态"};
@@ -380,15 +380,15 @@
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("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("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")?"已支付差价":"";
+ d.get("orderState").toString().equals("12")?"取消待支付":"";
}
if(null == d.get("state")){
values[i][13]="";
@@ -401,7 +401,7 @@
}
}
- String fileNameTitle="快车改派";
+ String fileNameTitle="跨城改派";
HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
this.setResponseHeader(response, fileName);
OutputStream os = response.getOutputStream();
@@ -462,7 +462,7 @@
Date date = new Date();
DateFormat format = new SimpleDateFormat("yyyyMMdd");
String time = format.format(date);
- String fileName = "快车改派"+time+".xls";
+ String fileName = "小件物流改派"+time+".xls";
String[] title = new String[] {"申请改派时间","申请司机","申请原因","订单编号","下单用户","出发时间","出发地","目的地"
,"原服务车辆","改派处罚金","改派服务司机","改派服务车辆","订单当前状态","改派状态"};
@@ -519,7 +519,7 @@
}
}
- String fileNameTitle="快车改派";
+ String fileNameTitle="小件物流改派";
HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
this.setResponseHeader(response, fileName);
OutputStream os = response.getOutputStream();
@@ -579,7 +579,7 @@
Date date = new Date();
DateFormat format = new SimpleDateFormat("yyyyMMdd");
String time = format.format(date);
- String fileName = "快车改派"+time+".xls";
+ String fileName = "出租车改派"+time+".xls";
String[] title = new String[] {"申请改派时间","申请司机","申请原因","订单编号","下单用户","出发时间","出发地","目的地"
,"原服务车辆","改派处罚金","改派服务司机","改派服务车辆","订单当前状态","改派状态"};
@@ -615,15 +615,15 @@
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("4")?"待乘客上车":
d.get("orderState").toString().equals("5")?"服务中":
- d.get("orderState").toString().equals("6")?"已送达":
+ 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("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")?"已支付差价":"";
+ d.get("orderState").toString().equals("12")?"取消待支付":"";
}
if(null == d.get("state")){
values[i][13]="";
--
Gitblit v1.7.1