Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
indicators
Overview
Overview
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
zhangkb
indicators
Commits
ee77160f
Commit
ee77160f
authored
Aug 13, 2020
by
zhangkb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改填充基础项报表接口
parent
d08a82bc
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
IndicatorReportCtrl.java
.../keymobile/indicators/api/report/IndicatorReportCtrl.java
+2
-2
DriveIndCalResultDefMapper.java
...rs/model/mapper/indmapper/DriveIndCalResultDefMapper.java
+2
-2
IndicatorsReportService.java
...le/indicators/service/report/IndicatorsReportService.java
+2
-2
DriveIndCalResultDefMapper.xml
.../resources/mybatis/mapping/DriveIndCalResultDefMapper.xml
+2
-2
No files found.
src/main/java/com/keymobile/indicators/api/report/IndicatorReportCtrl.java
View file @
ee77160f
...
...
@@ -22,8 +22,8 @@ public class IndicatorReportCtrl {
@ApiOperation
(
value
=
"整合指标本期同期报表数据"
,
notes
=
"整合指标本期同期报表数据"
)
@PostMapping
(
value
=
"/dealReportOne"
)
public
String
dealReportOne
(
@RequestParam
String
code
)
{
indicatorsReportService
.
dealReportOne
(
code
);
public
String
dealReportOne
(
@RequestParam
String
code
,
@RequestParam
Integer
date
)
{
indicatorsReportService
.
dealReportOne
(
code
,
date
);
return
"考核指标本期同期报表数据开始整合..."
;
}
...
...
src/main/java/com/keymobile/indicators/model/mapper/indmapper/DriveIndCalResultDefMapper.java
View file @
ee77160f
...
...
@@ -46,14 +46,14 @@ public interface DriveIndCalResultDefMapper extends BaseMapper<DriveIndCalResult
public
DriveIndCalResultDef
findByCompareIdAndCompareObjAndIndIdAndDate
(
@Param
(
"compareId"
)
String
compareId
,
@Param
(
"compareObj"
)
String
compareObj
,
@Param
(
"indId"
)
String
indId
,
@Param
(
"date"
)
int
date
);
@Param
(
"indId"
)
String
indId
,
@Param
(
"date"
)
Integer
date
);
public
List
<
DriveIndCalResultDef
>
findByIndIdAndDateAndCompareObjIn
(
Map
<
String
,
Object
>
param
);
public
List
<
DriveIndCalResultDef
>
findByCompareIdAndDate
(
@Param
(
"compareId"
)
String
compareId
,
@Param
(
"date"
)
Integer
date
);
public
List
<
DriveIndCalResultDef
>
findReportData
(
@Param
(
"code"
)
String
code
);
public
List
<
DriveIndCalResultDef
>
findReportData
(
@Param
(
"code"
)
String
code
,
@Param
(
"date"
)
Integer
date
);
//批量保存
public
void
batchSave
(
@Param
(
"datas"
)
List
<
DriveIndCalResultDef
>
datas
);
...
...
src/main/java/com/keymobile/indicators/service/report/IndicatorsReportService.java
View file @
ee77160f
...
...
@@ -174,9 +174,9 @@ public class IndicatorsReportService {
//整合指标本期同期指标报表数据
@Async
public
String
dealReportOne
(
String
code
)
{
public
String
dealReportOne
(
String
code
,
Integer
date
)
{
//获取所有考核指标结果
List
<
DriveIndCalResultDef
>
calDatas
=
driveIndCalResultDefMapper
.
findReportData
(
code
);
List
<
DriveIndCalResultDef
>
calDatas
=
driveIndCalResultDefMapper
.
findReportData
(
code
,
date
);
List
<
IndicatorsReportOne
>
datas
=
new
ArrayList
<>();
for
(
DriveIndCalResultDef
calData
:
calDatas
)
{
//判断是否存在
...
...
src/main/resources/mybatis/mapping/DriveIndCalResultDefMapper.xml
View file @
ee77160f
...
...
@@ -143,8 +143,8 @@
from drive_ind_cal_result_def
where
score is not null and
code = #{code}
order by date desc
code = #{code}
and
date = #{date}
</select>
<insert
id=
"batchSave"
parameterType=
"java.util.List"
>
...
...
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