From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 0026117..6f2a6a1 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -102,7 +102,7 @@
*/
@RequestMapping("/tDriver_add")
public String tDriverAdd(Model model) {
- List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).ne("flag", 3));
model.addAttribute("companyList",companyList);
Integer roleType = ShiroKit.getUser().getRoleType();
@@ -181,12 +181,12 @@
model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());
if (1 == roleType){
- List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).ne("flag", 3));
model.addAttribute("companyList",companyList);
List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()));
model.addAttribute("franchiseeList",franchiseeList);
}else if (2 == roleType){
- List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()).ne("flag", 3));
model.addAttribute("franchiseeList",franchiseeList);
}
@@ -207,6 +207,7 @@
Integer four = 1;
Integer five = 1;
Integer six = 1;
+ Integer seven = 1;
for (TDriverService obj : serviceList){
if (obj.getType() == 1){
one = 2;
@@ -226,6 +227,9 @@
if (obj.getType() == 6){
six = 2;
}
+ if (obj.getType() == 7){
+ seven = 2;
+ }
}
model.addAttribute("one",one);
model.addAttribute("two",two);
@@ -233,6 +237,7 @@
model.addAttribute("four",four);
model.addAttribute("five",five);
model.addAttribute("six",six);
+ model.addAttribute("seven",seven);
//查询线路列表
List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));
@@ -877,7 +882,7 @@
shellList.add("工号[选填]");
shellList.add("经营业务:专车[是/否]");
shellList.add("经营业务:出租车[是/否]");
- shellList.add("经营业务:直通车[是/否]");
+ shellList.add("经营业务:跨城[是/否]");
shellList.add("经营业务:小件同城物流[是/否]");
shellList.add("经营业务:小件跨城物流[是/否]");
shellList.add("经营业务:包车[是/否]");
@@ -897,7 +902,7 @@
shellList.add("工号[选填]");
shellList.add("经营业务:专车[是/否]");
shellList.add("经营业务:出租车[是/否]");
- shellList.add("经营业务:直通车[是/否]");
+ shellList.add("经营业务:跨城[是/否]");
shellList.add("经营业务:小件同城物流[是/否]");
shellList.add("经营业务:小件跨城物流[是/否]");
shellList.add("经营业务:包车[是/否]");
@@ -916,7 +921,7 @@
shellList.add("工号[选填]");
shellList.add("经营业务:专车[是/否]");
shellList.add("经营业务:出租车[是/否]");
- shellList.add("经营业务:直通车[是/否]");
+ shellList.add("经营业务:跨城[是/否]");
shellList.add("经营业务:小件同城物流[是/否]");
shellList.add("经营业务:小件跨城物流[是/否]");
shellList.add("经营业务:包车[是/否]");
@@ -1095,7 +1100,7 @@
}
//判断经营业务【跨城出行】
if (!thirteen.equals("是") && !thirteen.equals("否")){
- return new ErrorTip(500, "经营业务【直通车】内容不正确");
+ return new ErrorTip(500, "经营业务【跨城】内容不正确");
}
//判断经营业务【小件同城物流】
if (!fourteen.equals("是") && !fourteen.equals("否")){
@@ -1354,7 +1359,7 @@
}
//判断经营业务【跨城出行】
if (!eleven.equals("是") && !eleven.equals("否")){
- return new ErrorTip(500, "经营业务【直通车】内容不正确");
+ return new ErrorTip(500, "经营业务【跨城】内容不正确");
}
//判断经营业务【小件同城物流】
if (!twelve.equals("是") && !twelve.equals("否")){
@@ -1593,7 +1598,7 @@
}
//判断经营业务【跨城出行】
if (!ten.equals("是") && !ten.equals("否")){
- return new ErrorTip(500, "经营业务【直通车】内容不正确");
+ return new ErrorTip(500, "经营业务【跨城】内容不正确");
}
//判断经营业务【小件同城物流】
if (!eleven.equals("是") && !eleven.equals("否")){
--
Gitblit v1.7.1