Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
3b7db286
Commit
3b7db286
authored
Nov 23, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改报表参数
parent
77fc7979
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
JpStationMapper.xml
...f-api/src/main/resources/mapper/mysql/JpStationMapper.xml
+1
-1
JpStationServiceImpl.java
...ot/module/hygf/biz/service/impl/JpStationServiceImpl.java
+12
-0
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @
3b7db286
...
@@ -181,7 +181,7 @@
...
@@ -181,7 +181,7 @@
<if
test=
"dto.thirdStationIds!=null"
>
<if
test=
"dto.thirdStationIds!=null"
>
and hygf_jp_station.third_station_id in
and hygf_jp_station.third_station_id in
<foreach
collection=
"dto.thirdStationIds"
item=
"item"
index=
"index"
open=
"("
separator=
","
close=
")"
>
<foreach
collection=
"dto.thirdStationIds"
item=
"item"
index=
"index"
open=
"("
separator=
","
close=
")"
>
#{item
.stationId
}
#{item}
</foreach>
</foreach>
</if>
</if>
<if
test=
"dto.thirdStationId!=null"
>
<if
test=
"dto.thirdStationId!=null"
>
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
View file @
3b7db286
...
@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
...
@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
com.alibaba.excel.EasyExcel
;
import
com.alibaba.excel.EasyExcel
;
import
com.alibaba.excel.support.ExcelTypeEnum
;
import
com.alibaba.excel.support.ExcelTypeEnum
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
...
@@ -375,6 +376,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
...
@@ -375,6 +376,12 @@ 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
){
//平台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
);
List
<
JpStation
>
dataJpStation
=
jpStationMapper
.
getJpStation
(
reviewDto
);
if
(
reviewDto
.
getThirdStationIds
()==
null
){
if
(
reviewDto
.
getThirdStationIds
()==
null
){
for
(
JpStation
jpStation
:
dataJpStation
)
{
for
(
JpStation
jpStation
:
dataJpStation
)
{
...
@@ -556,6 +563,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
...
@@ -556,6 +563,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
//权限
//权限
//权限
//权限
List
<
String
>
statioId
=
new
ArrayList
();
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
);
List
<
JpStation
>
dataJpStation
=
jpStationMapper
.
getJpStation
(
reviewDto
);
if
(
reviewDto
.
getThirdStationIds
()==
null
){
if
(
reviewDto
.
getThirdStationIds
()==
null
){
for
(
JpStation
jpStation
:
dataJpStation
)
{
for
(
JpStation
jpStation
:
dataJpStation
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment