|
|
|
@ -35,7 +35,7 @@ public class TerminalExtServiceImpl implements TerminalExtService {
|
|
|
|
|
@Resource
|
|
|
|
|
TowerDao towerDao;
|
|
|
|
|
@Resource
|
|
|
|
|
ActivitiesService activitiesService;
|
|
|
|
|
MntnActivityTerminalsMapper terminalsMapper;
|
|
|
|
|
@Resource
|
|
|
|
|
UserService userService;
|
|
|
|
|
@Resource
|
|
|
|
@ -118,7 +118,7 @@ public class TerminalExtServiceImpl implements TerminalExtService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (vo.getActivityId() != null && vo.getActivityId() > 0) {
|
|
|
|
|
List<MntnActivityTerminals> actList = activitiesService.detail(vo.getActivityId());
|
|
|
|
|
List<MntnActivityTerminals> actList = this.activityDetail(vo.getActivityId());
|
|
|
|
|
List<Integer> idList = new ArrayList<>();
|
|
|
|
|
for (MntnActivityTerminals item : actList) {
|
|
|
|
|
idList.add(item.getTermId());
|
|
|
|
@ -132,6 +132,14 @@ public class TerminalExtServiceImpl implements TerminalExtService {
|
|
|
|
|
return new PageInfo<>(list);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<MntnActivityTerminals> activityDetail(Integer id) {
|
|
|
|
|
MntnActivityTerminalsExample example = new MntnActivityTerminalsExample();
|
|
|
|
|
MntnActivityTerminalsExample.Criteria criteria = example.createCriteria();
|
|
|
|
|
criteria.andActivityIdEqualTo(id);
|
|
|
|
|
List<MntnActivityTerminals> list = terminalsMapper.selectByExample(example);
|
|
|
|
|
return list;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<View_Dy_Line_Tower_Terminals> getExtTerminalList(TerminalSelectVo vo) {
|
|
|
|
|
Integer online = vo.getIsonline();
|
|
|
|
|