From cc175f25cbd953fc2c3623495c1f4b8e0efec4ee Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 25 二月 2025 17:12:16 +0800 Subject: [PATCH] 2.0新增 --- ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 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 829f722..bf98a4a 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"; + } /** * 跳转到审核通过司机首页 */ @@ -565,6 +589,8 @@ @Autowired private ITOrderEvaluateService itOrderEvaluateService; + @Autowired + private IInviteService inviteService; /** * 获取审核通过的司机列表 */ @@ -599,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>() -- Gitblit v1.7.1