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
a795255d
Commit
a795255d
authored
Feb 01, 2018
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app排序
parent
cb5ef8cf
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
workspace.xml
.idea/workspace.xml
+0
-0
ContractRepository.java
src/main/java/common/repository/ContractRepository.java
+1
-1
ContractSendEmailThread.java
src/main/java/common/task/ContractSendEmailThread.java
+2
-2
No files found.
.idea/workspace.xml
View file @
a795255d
This diff is collapsed.
Click to expand it.
src/main/java/common/repository/ContractRepository.java
View file @
a795255d
...
...
@@ -30,7 +30,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query
(
value
=
"SELECT * from contract where platform = ?1 and email = ?2"
,
nativeQuery
=
true
)
List
<
Contract
>
findByPlatformAndEmail
(
String
platform
,
String
email
);
@Query
(
value
=
"SELECT * from contract where start_date = ?1"
,
nativeQuery
=
true
)
@Query
(
value
=
"SELECT * from contract where start_date = ?1
and status <> 'cancel'
"
,
nativeQuery
=
true
)
List
<
Contract
>
findByStartDate
(
String
startDate
);
@Query
(
value
=
"SELECT * from contract where end_date <= ?1 and (status <> 'end' or status <> 'cancel')"
,
nativeQuery
=
true
)
...
...
src/main/java/common/task/ContractSendEmailThread.java
View file @
a795255d
...
...
@@ -48,10 +48,10 @@ public class ContractSendEmailThread
User
user
=
userRepository
.
findOne
(
this
.
contract
.
getSale
());
List
<
String
>
list
=
new
ArrayList
<>();
list
.
add
(
user
.
getEmail
());
if
(!
user
.
getRoleType
().
equals
(
RoleTypeEnum
.
MANAGER
)){
if
(!
user
.
getRoleType
().
equals
(
RoleTypeEnum
.
MANAGER
.
getKey
()
)){
List
<
User
>
userList
=
userRepository
.
findOneDepartment
(
user
.
getRole
());
for
(
User
u
:
userList
){
if
(
u
.
getRoleType
().
equals
(
RoleTypeEnum
.
MANAGER
)){
if
(
u
.
getRoleType
().
equals
(
RoleTypeEnum
.
MANAGER
.
getKey
()
)){
list
.
add
(
u
.
getEmail
());
}
}
...
...
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