|
@@ -458,13 +458,13 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
|
|
lists = dataMapper.listRankWater(waterWrapper);
|
|
lists = dataMapper.listRankWater(waterWrapper);
|
|
}
|
|
}
|
|
if ("2".equals(dataType)) {
|
|
if ("2".equals(dataType)) {
|
|
- lists = dataMapper.listRankElectricity(waterWrapper);
|
|
|
|
|
|
+ lists = dataMapper.listRankElectricity(electricityWrapper);
|
|
}
|
|
}
|
|
if ("3".equals(dataType)) {
|
|
if ("3".equals(dataType)) {
|
|
- lists = dataMapper.listRankFeed(waterWrapper);
|
|
|
|
|
|
+ lists = dataMapper.listRankFeed(feedWrapper);
|
|
}
|
|
}
|
|
if ("4".equals(dataType)) {
|
|
if ("4".equals(dataType)) {
|
|
- lists = dataMapper.listRankGas(waterWrapper);
|
|
|
|
|
|
+ lists = dataMapper.listRankGas(gasWrapper);
|
|
}
|
|
}
|
|
|
|
|
|
for (ListRankVo list : lists) {
|
|
for (ListRankVo list : lists) {
|