Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 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;
    }