From f4e12a183070e9fc1db174dfb7f1c9a59f7763a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 四月 2025 09:08:23 +0800
Subject: [PATCH] 新增加功能
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index b39d003..b64a4ec 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -87,7 +87,27 @@
private boolean pushMinistryOfTransport;
-
+ @RequestMapping(value = "/inviteList")
+ @ResponseBody
+ public Object list(Integer uid,String userName,String time) {
+ if (uid==null)return null;
+ String startTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(time)){
+ String[] timeArray = time.split(" - ");
+ startTime = timeArray[0]+" 00:00:00";
+ endTime = timeArray[1]+" 23:59:59";
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ List<Map<String, Object>> userList = tDriverService.inviteList(page, startTime,endTime,userName,uid);
+ for (Map<String, Object> stringObjectMap : userList) {
+ String string = stringObjectMap.get("inviteUserId").toString();
+ TDriver tUser = tDriverService.selectById(string);
+ stringObjectMap.put("inviteUserName",tUser.getName());
+ }
+ page.setRecords(userList);
+ return super.packForBT(page);
+ }
/**
* 跳转到司机审核列表首页
*/
@@ -95,7 +115,11 @@
public String index() {
return PREFIX + "tDriver.html";
}
-
+ @RequestMapping("/invite/{id}")
+ public String inviteList(@PathVariable("id")Integer id, Model model) {
+ model.addAttribute("id",id);
+ return PREFIX + "tDriver_invite.html";
+ }
/**
* 跳转到审核通过司机首页
*/
@@ -109,7 +133,8 @@
*/
@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();
@@ -188,12 +213,15 @@
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()));
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>()
+ .ne("flag",3).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>()
+ .ne("flag",3).eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
model.addAttribute("franchiseeList",franchiseeList);
}
@@ -561,6 +589,8 @@
@Autowired
private ITOrderEvaluateService itOrderEvaluateService;
+ @Autowired
+ private IInviteService inviteService;
/**
* 获取审核通过的司机列表
*/
@@ -595,6 +625,11 @@
.eq("orderType", 2));
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
for (Map<String, Object> stringObjectMap : driverList) {
+ String string = stringObjectMap.get("id").toString();
+ int i = inviteService.selectCount(new EntityWrapper<Invite>()
+ .eq("inviteUserId", string)
+ .eq("userType",2));
+ stringObjectMap.put("inviteNumber", i);
// 司机id
Integer id = Integer.valueOf(stringObjectMap.get("id").toString());
List<TOrderEvaluate> driverId = itOrderEvaluateService.selectList(new EntityWrapper<TOrderEvaluate>()
@@ -1866,6 +1901,7 @@
shellList.add("服务模式");
shellList.add("关联线路");
shellList.add("评分");
+ shellList.add("邀请次数");
shellList.add("历史接单数");
shellList.add("历史订单总金额");
shellList.add("当前钱包余额");
@@ -1933,6 +1969,11 @@
}else{
shellList.add("0");
}
+ if(SinataUtil.isNotEmpty(object.get("inviteNumber"))){
+ shellList.add(object.get("inviteNumber").toString());
+ }else{
+ shellList.add("0");
+ }
if(SinataUtil.isNotEmpty(object.get("historyNum"))){
shellList.add(object.get("historyNum").toString());
}else{
--
Gitblit v1.7.1