Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
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
reyun
manager
Commits
a337353b
Commit
a337353b
authored
4 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DMP 收入导入
parent
c24c5ac8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
DmpIncomeController.java
src/main/java/common/controller/DmpIncomeController.java
+2
-3
DmpIncomeServiceImpl.java
src/main/java/common/service/impl/DmpIncomeServiceImpl.java
+3
-0
No files found.
src/main/java/common/controller/DmpIncomeController.java
View file @
a337353b
...
...
@@ -20,9 +20,9 @@ public class DmpIncomeController {
@GetMapping
(
"/list/bycode"
)
public
ResultModel
listByContract
(
String
co
ntractCo
de
)
{
public
ResultModel
listByContract
(
String
code
)
{
//按合同查询
return
ResultModel
.
OK
(
dmpIncomeService
.
listByCode
(
co
ntractCo
de
));
return
ResultModel
.
OK
(
dmpIncomeService
.
listByCode
(
code
));
}
@GetMapping
(
"/list/byds"
)
...
...
@@ -52,5 +52,4 @@ public class DmpIncomeController {
}
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/DmpIncomeServiceImpl.java
View file @
a337353b
...
...
@@ -91,6 +91,9 @@ public class DmpIncomeServiceImpl implements DmpIncomeService {
@Override
public
List
<
DmpIncome
>
listByDs
(
String
start
,
String
end
)
{
List
<
DmpIncome
>
dmpIncomes
=
dmpIncomeRepository
.
findByContractDs
(
start
,
end
);
if
(
dmpIncomes
.
isEmpty
())
{
return
dmpIncomes
;
}
List
<
String
>
codes
=
dmpIncomes
.
stream
().
map
(
v
->
v
.
getContractCode
()).
collect
(
Collectors
.
toList
());
List
<
Object
[]>
contracts
=
contractRepository
.
findByDmpContractCode
(
codes
);
Map
<
String
,
Object
[]>
names
=
contracts
.
stream
().
collect
(
Collectors
.
toMap
(
v
->
v
[
0
]
+
""
,
v
->
v
,
(
v1
,
v2
)
->
v1
));
...
...
This diff is collapsed.
Click to expand it.
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