From 582893600b9310b881c96f3ffb8ff713481b26fb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 12 四月 2025 18:13:03 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 35d45c1..1aaec3e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.SinataUtil;
@@ -15,18 +16,20 @@
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 专车改派管理控制器
@@ -78,8 +81,8 @@
@Autowired
private ITOrderLogisticsService orderLogisticsService;
-
-
+ @Autowired
+ private ITPubTransactionDetailsService itPubTransactionDetailsService;
/**
* 跳转到专车改派管理首页
@@ -97,7 +100,6 @@
return PREFIX + "cross.html";
}
-
/**
* 跳转到小件物流改派管理首页
*/
@@ -105,7 +107,6 @@
public String smallPieceLogistics() {
return PREFIX + "smallPieceLogistics.html";
}
-
/**
* 跳转到添加专车改派管理
@@ -143,7 +144,7 @@
model.addAttribute("tReassignId",tReassignId);
return PREFIX + "tReassign_reassignmentCross.html";
}
-
+
/**
* 跳转到修改跨城改派管理
*/
@@ -153,7 +154,6 @@
return PREFIX + "tReassign_reassignmentSmall.html";
}
-
@RequestMapping("/lookDetail/{id}")
public String lookDetail(@PathVariable Integer id, Model model) {
TReassign tReassign = tReassignService.selectById(id);
@@ -161,8 +161,7 @@
model.addAttribute("str",str);
return "/system/tComplaint/lookDetail.html";
}
-
-
+
/**
* 获取专车改派管理列表
*/
@@ -213,7 +212,6 @@
return super.packForBT(page);
}
-
/**
* 获取跨城改派管理列表
*/
@@ -239,7 +237,6 @@
return super.packForBT(page);
}
-
/**
* 选择司机列表
*/
@@ -251,7 +248,7 @@
TReassign reassign = tReassignService.selectById(orderId);
TOrderPrivateCar privateCar = itOrderPrivateCarService.selectById(reassign.getOrderId());
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tReassignService.getCanSelectPrivateCarDriverList(page,privateCar.getCompanyId(),privateCar.getDriverId(),name,phone));
+ page.setRecords(tReassignService.getCanSelectPrivateCarDriverList(page,privateCar.getServerCarModelId(),privateCar.getDriverId(),name,phone));
return super.packForBT(page);
}
@@ -272,7 +269,6 @@
return super.packForBT(page);
}
-
/**
* 选择司机列表
*/
@@ -284,10 +280,9 @@
TReassign reassign = tReassignService.selectById(orderId);
TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(reassign.getOrderId());
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tReassignService.getCanSelectSmallDriverList(page,tOrderLogistics.getCompanyId(), tOrderLogistics.getDriverId(), tOrderLogistics.getType(),name,phone));
+ page.setRecords(tReassignService.getCanSelectSmallDriverList(page,tOrderLogistics.getServerCarModelId(), tOrderLogistics.getDriverId(), tOrderLogistics.getType(),name,phone));
return super.packForBT(page);
}
-
/**
* 操作专车改派管理
@@ -359,9 +354,6 @@
// itPubTransactionDetailsService.insert(details);
return SUCCESS_TIP;
}
-
- @Autowired
- private ITPubTransactionDetailsService itPubTransactionDetailsService;
/**
* 操作跨城改派管理
--
Gitblit v1.7.1