Commit 0916001f authored by tangwei's avatar tangwei

修改电站日报参数

parent 3856dd2b
...@@ -383,10 +383,10 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -383,10 +383,10 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
public Page<JpStationDto> queryReport(int pageNum, int pageSize, JpStationDto reviewDto,String type) { public Page<JpStationDto> queryReport(int pageNum, int pageSize, JpStationDto reviewDto,String type) {
//权限 //权限
List<String> statioId=new ArrayList(); List<String> statioId=new ArrayList();
if(reviewDto.getThirdStationIds()!=null){ // if(reviewDto.getThirdStationIds()!=null){
List<String> dd= reviewDto.getThirdStationIds()!=null? JSON.parseArray(reviewDto.getThirdStationIds().get(0),String.class):null; // List<String> dd= reviewDto.getThirdStationIds()!=null? JSON.parseArray(reviewDto.getThirdStationIds().get(0),String.class):null;
reviewDto.setThirdStationIds(dd); // reviewDto.setThirdStationIds(dd);
} // }
List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto); List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
if(reviewDto.getThirdStationIds()==null||reviewDto.getThirdStationIds().isEmpty()){ if(reviewDto.getThirdStationIds()==null||reviewDto.getThirdStationIds().isEmpty()){
...@@ -572,10 +572,10 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -572,10 +572,10 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
//权限 //权限
//权限 //权限
List<String> statioId=new ArrayList(); List<String> statioId=new ArrayList();
if(reviewDto.getThirdStationIds()!=null){ // if(reviewDto.getThirdStationIds()!=null){
List<String> dd= reviewDto.getThirdStationIds()!=null? JSON.parseArray(reviewDto.getThirdStationIds().get(0),String.class):null; // List<String> dd= reviewDto.getThirdStationIds()!=null? JSON.parseArray(reviewDto.getThirdStationIds().get(0),String.class):null;
reviewDto.setThirdStationIds(dd); // reviewDto.setThirdStationIds(dd);
} // }
List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto); List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
if(reviewDto.getThirdStationIds()==null||reviewDto.getThirdStationIds().isEmpty()){ if(reviewDto.getThirdStationIds()==null||reviewDto.getThirdStationIds().isEmpty()){
for (JpStation jpStation : dataJpStation) { for (JpStation jpStation : dataJpStation) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment