|
|
@@ -1,6 +1,7 @@
|
|
|
package com.railway.business.catenary.service.impl;
|
|
|
|
|
|
import com.railway.business.baseinfo.domain.BusZzdzxx;
|
|
|
+import com.railway.business.baseinfo.domain.vo.BusSmartQueryVo;
|
|
|
import com.railway.business.baseinfo.mapper.BusZzdzxxMapper;
|
|
|
import com.railway.business.catenary.domain.BusJlgz;
|
|
|
import com.railway.business.catenary.domain.BusJlgzPic;
|
|
|
@@ -122,12 +123,12 @@ public class BusJlgzServiceImpl implements IBusJlgzService {
|
|
|
// 有站场区间,支柱号 查询支柱公里标
|
|
|
if (StringUtils.isNoneBlank(busJlgz.getPillarCode())
|
|
|
&& busJlgz.getStationId() != null) {
|
|
|
- BusZzdzxx busZzdzxx = new BusZzdzxx();
|
|
|
- busZzdzxx.setPillarCode(busJlgz.getPillarCode());
|
|
|
- busZzdzxx.setStationId(busJlgz.getStationId());
|
|
|
- busZzdzxx.setLineId(busJlgz.getLineId());
|
|
|
- busZzdzxx.setXingbie(busJlgz.getXingbie());
|
|
|
- List<BusZzdzxx> zzList = busZzdzxxMapper.getList(busZzdzxx);
|
|
|
+ BusSmartQueryVo vo = new BusSmartQueryVo();
|
|
|
+ vo.setPillarCode(busJlgz.getPillarCode());
|
|
|
+ vo.setStationId(busJlgz.getStationId());
|
|
|
+ vo.setLineId(busJlgz.getLineId());
|
|
|
+ vo.setXingbie(busJlgz.getXingbie());
|
|
|
+ List<BusZzdzxx> zzList = busZzdzxxMapper.smartQuery(vo);
|
|
|
if (zzList != null && zzList.size() > 0) {
|
|
|
BusZzdzxx zz = zzList.get(0);
|
|
|
busJlgz.setMarker(zz.getMarker());
|
|
|
@@ -144,12 +145,12 @@ public class BusJlgzServiceImpl implements IBusJlgzService {
|
|
|
// 有站场区间,支柱号 查询支柱公里标
|
|
|
if (StringUtils.isNoneBlank(busJlgzQueryVo.getPillarCode())
|
|
|
&& busJlgzQueryVo.getStationId() != null) {
|
|
|
- BusZzdzxx busZzdzxx = new BusZzdzxx();
|
|
|
- busZzdzxx.setPillarCode(busJlgzQueryVo.getPillarCode());
|
|
|
- busZzdzxx.setStationId(busJlgzQueryVo.getStationId());
|
|
|
- busZzdzxx.setLineId(busJlgzQueryVo.getLineId());
|
|
|
- busZzdzxx.setXingbie(busJlgzQueryVo.getXingbie());
|
|
|
- List<BusZzdzxx> zzList = busZzdzxxMapper.getList(busZzdzxx);
|
|
|
+ BusSmartQueryVo vo = new BusSmartQueryVo();
|
|
|
+ vo.setPillarCode(busJlgzQueryVo.getPillarCode());
|
|
|
+ vo.setStationId(busJlgzQueryVo.getStationId());
|
|
|
+ vo.setLineId(busJlgzQueryVo.getLineId());
|
|
|
+ vo.setXingbie(busJlgzQueryVo.getXingbie());
|
|
|
+ List<BusZzdzxx> zzList = busZzdzxxMapper.smartQuery(vo);
|
|
|
if (zzList != null && zzList.size() > 0) {
|
|
|
BusZzdzxx zz = zzList.get(0);
|
|
|
busJlgzQueryVo.setMarker(zz.getMarker());
|