From daf38357323ae9f1ef03c00960f9e7d8bc444702 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 23 八月 2024 15:45:56 +0800
Subject: [PATCH] 修改2.0 bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java | 4 ++++
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java
index aa9afb7..fcc31e6 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java
@@ -145,12 +145,16 @@
public Object detail(@PathVariable("tReportLossId") Integer tReportLossId) {
return tReportLossService.selectById(tReportLossId);
}
+
+
+
@RequestMapping(value = "/dispose")
@ResponseBody
public Object dispose(Integer id,String info) {
TReportLoss tReportLoss = tReportLossService.selectById(id);
tReportLoss.setDisposeInfo(info);
tReportLoss.setStatus(2);
+ tReportLoss.setHandleTime(new Date());
tReportLoss.setHandleUserId(ShiroKit.getUser().getObjectId());
boolean b = tReportLossService.updateById(tReportLoss);
if(b){
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java
index 6c46d5a..e791822 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java
@@ -337,7 +337,7 @@
if(0 == h){
usedTime = language == 1 ? m + "分钟" : language == 2 ? m + "-minute(s)" : m + "-minute";
}else{
- usedTime = language == 1 ? h + "小时" + m + "分钟" : language == 2 ? h + "-hour" + m + "-minute" : h + "-hour" + m + "-minute";
+ usedTime = language == 1 ? h + "小时" + m + "分钟" : language == 2 ? h + "-hour" + m + "-minute(s)" : h + "-hour" + m + "-minute";
}
orderTimeInfo.setUsedTime(usedTime);
if(null != orderLogistics.getEndServiceTime()){
@@ -361,9 +361,9 @@
m = duration % 60;
String remainingTime = "";
if(0 == h){
- remainingTime = language == 1 ? m + "分钟" : language == 2 ? m + "-minute" : m + "-minute";
+ remainingTime = language == 1 ? m + "分钟" : language == 2 ? m + "-minute(s)" : m + "-minute";
}else{
- remainingTime = language == 1 ? h + "小时" + m + "分钟" : language == 2 ? h + "-hour" + m + "-minute" : h + "-hour" + m + "-minute";
+ remainingTime = language == 1 ? h + "小时" + m + "分钟" : language == 2 ? h + "-hour" + m + "-minute(s)" : h + "-hour" + m + "-minute";
}
orderTimeInfo.setRemainingTime(remainingTime);
}
--
Gitblit v1.7.1