From 31ce6be2d56798d9509e6d90335999064351f7f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 10 十二月 2024 16:06:26 +0800
Subject: [PATCH] 12.10
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java
index ab590af..35bd8fc 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java
@@ -2,12 +2,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.crossCity.dao.LineMapper;
-import com.stylefeng.guns.modular.crossCity.dao.LineShiftDriverMapper;
-import com.stylefeng.guns.modular.crossCity.dao.LineShiftMapper;
-import com.stylefeng.guns.modular.crossCity.model.Line;
-import com.stylefeng.guns.modular.crossCity.model.LineShift;
-import com.stylefeng.guns.modular.crossCity.model.LineShiftDriver;
+import com.stylefeng.guns.modular.crossCity.dao.*;
+import com.stylefeng.guns.modular.crossCity.model.*;
import com.stylefeng.guns.modular.crossCity.server.ILineService;
import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -82,6 +78,13 @@
}
+
+
+ @Resource
+ private SiteMapper siteMapper;
+
+ @Resource
+ private TLineSiteMapper tLineSiteMapper;
/**
* 根据站点id获取线路
* @param startId
@@ -117,7 +120,31 @@
}
}
}
- list = lists;
+
+ for (Map<String, Object> stringObjectMap : lists) {
+ Line id = lineMapper.selectById(stringObjectMap.get("id").toString());
+ List<TLineSite> start = tLineSiteMapper.selectList(new EntityWrapper<TLineSite>().eq("lineId", id.getId()).eq("type", 1));
+ List<TLineSite> end = tLineSiteMapper.selectList(new EntityWrapper<TLineSite>().eq("lineId", id.getId()).eq("type", 2));
+
+ Site startSite = siteMapper.selectById(start.get(0).getSiteId());
+ Site endSite = siteMapper.selectById(end.get(0).getSiteId());
+
+ stringObjectMap.put("startSiteName",startSite.getName());
+ stringObjectMap.put("endSiteName",endSite.getName());
+ stringObjectMap.put("startCityName",startSite.getCity());
+ stringObjectMap.put("endCityName",endSite.getCity());
+// stringObjectMap.put("city",endSite.getCity());
+ stringObjectMap.put("startCityId",startSite.getId());
+ stringObjectMap.put("endCityId",endSite.getId());
+
+
+
+ }
+
+
+
+ return lists;
+// list = lists;
}
return list;
}
--
Gitblit v1.7.1