yangshj
/
zhongwei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

#代码修改

zhongwei
yang_shj 1 year ago
parent
e8d1be1e77
commit
e077bf30f3
2 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java
  2. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java

12
hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java
Unescape View File

@ -327,7 +327,7 @@ public class WaterServiceImpl implements IWaterService {
*/ */
private List<HzimsAnalyzeModelStationEntity> getModelStationList() { private List<HzimsAnalyzeModelStationEntity> getModelStationList() {
// 水利站点(All) // 水利站点(All)
List<StationEntity> stationList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, null, null,false); List<StationEntity> stationList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, null, null,true);
if(CollectionUtil.isEmpty(stationList)){ if(CollectionUtil.isEmpty(stationList)){
return null; return null;
} }
@ -827,7 +827,7 @@ public class WaterServiceImpl implements IWaterService {
@Override @Override
public WaterConservancyVo waterConservancy(Long deptId) { public WaterConservancyVo waterConservancy(Long deptId) {
// 查询水利站点 // 查询水利站点
List<StationEntity> stations = stationService.getHomeStationList(deptId, HomePageConstant.waterList, HomePageConstant.HYDROPOWER_SERVETYPE,false); List<StationEntity> stations = stationService.getHomeStationList(deptId, HomePageConstant.waterList, HomePageConstant.HYDROPOWER_SERVETYPE,true);
if (CollectionUtil.isEmpty(stations)) { if (CollectionUtil.isEmpty(stations)) {
return new WaterConservancyVo(); return new WaterConservancyVo();
} }
@ -888,7 +888,7 @@ public class WaterServiceImpl implements IWaterService {
public List<WaterDetailsVo> waterDetails(Long deptId) { public List<WaterDetailsVo> waterDetails(Long deptId) {
// 获取区域map ： key-区域机构 value-水利站点集合 // 获取区域map ： key-区域机构 value-水利站点集合
// 获取区域或者站点map结构 // 获取区域或者站点map结构
Map<Dept,List<StationEntity>> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,false); Map<Dept,List<StationEntity>> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,true);
if(MapUtils.isEmpty(map)){ if(MapUtils.isEmpty(map)){
return null; return null;
} }
@ -933,7 +933,7 @@ public class WaterServiceImpl implements IWaterService {
@Override @Override
public List<WaterRankingVo> waterUseEleRanking(Long deptId) { public List<WaterRankingVo> waterUseEleRanking(Long deptId) {
// 获取区域map ： key-区域机构 value-水利站点集合 // 获取区域map ： key-区域机构 value-水利站点集合
Map<Dept,List<StationEntity>> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,false); Map<Dept,List<StationEntity>> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,true);
if(MapUtils.isEmpty(map)){ if(MapUtils.isEmpty(map)){
return null; return null;
} }
@ -1002,7 +1002,7 @@ public class WaterServiceImpl implements IWaterService {
return null; return null;
} }
// 获取水利站点 // 获取水利站点
List<StationEntity> stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,false); List<StationEntity> stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,true);
if(CollectionUtil.isEmpty(stationList)){ if(CollectionUtil.isEmpty(stationList)){
return null; return null;
} }
@ -1062,7 +1062,7 @@ public class WaterServiceImpl implements IWaterService {
return null; return null;
} }
// 获取水利站点 // 获取水利站点
List<StationEntity> stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,false); List<StationEntity> stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,true);
if(CollectionUtil.isEmpty(stationList)){ if(CollectionUtil.isEmpty(stationList)){
return null; return null;
} }

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java
Unescape View File

@ -208,7 +208,7 @@ public class ImsDeptServiceImpl extends ServiceImpl<ImsDeptMapper, ImsDeptEntity
if(HomePageConstant.WATER_CONSERVANCY.equals(stationType)){ if(HomePageConstant.WATER_CONSERVANCY.equals(stationType)){
type = HomePageConstant.waterList; type = HomePageConstant.waterList;
} }
List<StationEntity> stationEntityList = stationService.getStationType(serveType, type ,value,false); List<StationEntity> stationEntityList = stationService.getStationType(serveType, type ,value,true);
if(CollectionUtil.isEmpty(stationEntityList)){ if(CollectionUtil.isEmpty(stationEntityList)){
return null; return null;
} }

Write Preview
Loading…
Cancel
Save