Commit 3b7db286 authored by tangwei's avatar tangwei

修改报表参数

parent 77fc7979
......@@ -181,7 +181,7 @@
<if test="dto.thirdStationIds!=null">
and hygf_jp_station.third_station_id in
<foreach collection="dto.thirdStationIds" item="item" index="index" open="(" separator="," close=")">
#{item.stationId}
#{item}
</foreach>
</if>
<if test="dto.thirdStationId!=null">
......
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -375,6 +376,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
public Page<JpStationDto> queryReport(int pageNum, int pageSize, JpStationDto reviewDto,String type) {
//权限
List<String> statioId=new ArrayList();
if(reviewDto.getThirdStationIds()!=null){
//平台bug,暂时处理
List<String> dd= reviewDto.getThirdStationIds()!=null? JSON.parseArray(reviewDto.getThirdStationIds().get(0),String.class):null;
reviewDto.setThirdStationIds(dd);
}
List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
if(reviewDto.getThirdStationIds()==null){
for (JpStation jpStation : dataJpStation) {
......@@ -556,6 +563,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
//权限
//权限
List<String> statioId=new ArrayList();
if(reviewDto.getThirdStationIds()!=null){
//平台bug,暂时处理
List<String> dd= reviewDto.getThirdStationIds()!=null? JSON.parseArray(reviewDto.getThirdStationIds().get(0),String.class):null;
reviewDto.setThirdStationIds(dd);
}
List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
if(reviewDto.getThirdStationIds()==null){
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