From 51a0a7ac431f11683958c8e4972f78c52a5dedb2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 十二月 2024 19:03:53 +0800
Subject: [PATCH] 修改 bug
---
ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index a47b5e0..79acdfb 100644
--- a/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -1,14 +1,21 @@
package com.stylefeng.guns.modular.system.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.dao.TDriverMapper;
+import com.stylefeng.guns.modular.system.model.TDriverLine;
+import com.stylefeng.guns.modular.system.model.TLine;
+import com.stylefeng.guns.modular.system.service.ITDriverLineService;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.service.ITLineService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -20,6 +27,15 @@
*/
@Service
public class TDriverServiceImpl extends ServiceImpl<TDriverMapper, TDriver> implements ITDriverService {
+
+ @Autowired
+ private ITDriverLineService driverLineService;
+
+ @Autowired
+ private ITLineService lineService;
+
+
+
@Override
public List<Map<String, Object>> getAuthDriverList(Page<Map<String, Object>> page, String beginTime, String endTime, String companyName, String phone, String account, Integer addType, Integer authState) {
@@ -33,7 +49,19 @@
@Override
public List<Map<String, Object>> getDriverList(Page<Map<String, Object>> page, Integer roleType,Integer nowUserId,String beginTime, String endTime, String companyName, String phone, String name, Integer addType, Integer authState) {
- return this.baseMapper.getDriverList(page,roleType,nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
+ List<Map<String, Object>> driverList = this.baseMapper.getDriverList(page, roleType, nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
+ for (Map<String, Object> map : driverList) {
+ Integer id = Integer.valueOf(map.get("id").toString());
+ List<TDriverLine> driverLines = driverLineService.selectList(new EntityWrapper<TDriverLine>().eq("driverId", id));
+ List<Integer> collect = driverLines.stream().map(TDriverLine::getLineId).collect(Collectors.toList());
+ if(collect.size() > 0){
+ List<TLine> tLines = lineService.selectBatchIds(collect);
+ String collect1 = tLines.stream().map(TLine::getName).collect(Collectors.joining("<br/>"));
+ map.put("lineStr", collect1);
+ }
+
+ }
+ return driverList;
}
@Override
--
Gitblit v1.7.1