From 8c85620b86975c3dedb67fc18994fcfa0ac68997 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 12 一月 2026 17:05:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 8952f24..dd03c5e 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -287,6 +287,8 @@
model.addAttribute("companyType",2);
}
+ model.addAttribute("companyData",tCompanyService.selectById(tDriver.getCompanyId()));
+
//获取经营业务
List<TDriverService> serviceList = tDriverServiceService.selectList(new EntityWrapper<TDriverService>().eq("driverId", tDriverId));
Integer one = 1;
@@ -619,6 +621,60 @@
}
/**
+ * 用于获取公司的经营业务【202601】
+ *
+ * @param oneId
+ * @return
+ */
+ @RequestMapping(value = "/twoChange")
+ @ResponseBody
+ public Object twoChange(@RequestParam Integer oneId) {
+ List<TCompany> list = new ArrayList<>();
+ if (SinataUtil.isNotEmpty(oneId)){
+ list = tCompanyService.selectList(new EntityWrapper<TCompany>()
+ .eq("type", 3)
+ .eq("superiorId", oneId)
+ .notIn("flag",3)
+ .notIn("state",1));
+ }
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("list", list);
+ TCompany company = tCompanyService.selectById(oneId);
+ map.put("company", company);
+ return map;
+ }
+
+
+
+ @RequestMapping(value = "/listLine")
+ @ResponseBody
+ public Object listLine(String oneId) {
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ if(objectId==1){
+ if(oneId==null || oneId.equals("") || oneId.equals("1")){
+ List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));
+ return lineList;
+ }else {
+ List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1).last(" and (id in (select lineId from t_line_company where companyId = " + oneId + ") or companyId = " + oneId + ")"));
+ return lineList;
+ }
+
+ }else {
+
+ TCompany company = tCompanyService.selectById(objectId);
+ oneId = company.getId().toString();
+ if(shiroExtUtil.getUser().getRoleType()==3){
+ TCompany company1 = tCompanyService.selectById(company.getSuperiorId());
+ oneId = company1.getId().toString();
+ }
+
+ List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1).last(" and (id in (select lineId from t_line_company where companyId = " + oneId + ") or companyId = " + oneId + ")"));
+ return lineList;
+ }
+
+ }
+
+ /**
* 获取司机审核列表列表
*/
@RequestMapping(value = "/list")
--
Gitblit v1.7.1