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
568150e0
Commit
568150e0
authored
5 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
操作日志
parent
390a851f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+5
-5
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
568150e0
...
...
@@ -1000,16 +1000,15 @@ public class ContractServiceImpl implements ContractService {
@Override
public
List
<
Contract
>
findAll
(
User
loginAccount
,
String
startDate
,
String
endDate
,
String
platform
,
String
contractId
)
{
List
<
Contract
>
result
=
new
ArrayList
<>();
List
<
User
>
sales
=
userRepository
.
findAll
();
List
<
Sales
>
salesList
=
salesRepository
.
findAllByStatusOn
();
Map
<
Long
,
String
>
saleMap
=
new
HashMap
<>();
if
(
ValidateUtil
.
isValid
(
sales
))
{
for
(
User
s
:
sales
)
{
if
(
ValidateUtil
.
isValid
(
sales
List
))
{
for
(
Sales
s
:
salesList
)
{
saleMap
.
put
(
s
.
getId
(),
s
.
getName
());
}
}
List
<
PackageType
>
typeList
=
packageTypeRepository
.
findAll
();
Map
<
Long
,
String
>
typeMap
=
new
HashMap
<>();
if
(
ValidateUtil
.
isValid
(
typeList
))
{
...
...
@@ -1364,6 +1363,7 @@ public class ContractServiceImpl implements ContractService {
ChangeDelInfo
changeDelInfo
=
new
ChangeDelInfo
();
changeDelInfo
.
setContractCode
(
contractMoney
.
getContractCode
());
changeDelInfo
.
setEmail
(
contractMoney
.
getEmail
());
changeDelInfo
.
setSourceId
(
contractMoney
.
getId
());
if
(
"pay"
.
equals
(
contractMoney
.
getType
())){
...
...
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