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
6778b148
Commit
6778b148
authored
Jul 26, 2019
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v1.3
parent
f8b78a2f
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
0 deletions
+15
-0
ContractController.java
src/main/java/common/controller/ContractController.java
+9
-0
ContractRepository.java
src/main/java/common/repository/ContractRepository.java
+3
-0
ContractService.java
src/main/java/common/service/ContractService.java
+3
-0
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+0
-0
No files found.
src/main/java/common/controller/ContractController.java
View file @
6778b148
...
...
@@ -75,6 +75,15 @@ public class ContractController {
return
ResultModel
.
OK
(
service
.
findAll
(
loginAccount
,
startDate
,
endDate
,
platform
,
contractId
));
}
@RequestMapping
(
value
=
"findOne"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ResultModel
findOne
(
@CurrentAccount
User
loginAccount
,
@PathVariable
String
platform
,
@RequestParam
String
startDate
,
@RequestParam
String
endDate
,
String
contractId
)
{
return
ResultModel
.
OK
(
service
.
findOne
(
loginAccount
,
startDate
,
endDate
,
platform
,
contractId
));
}
@RequestMapping
(
value
=
"export"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_OCTET_STREAM_VALUE
)
@ResponseBody
public
ResponseEntity
<
byte
[]>
export
(
@CurrentAccount
User
loginAccount
,
@PathVariable
String
platform
,
@RequestParam
String
startDate
...
...
src/main/java/common/repository/ContractRepository.java
View file @
6778b148
...
...
@@ -79,4 +79,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query
(
value
=
"SELECT * from contract where platform =?1 and email = ?2 and (status <> 'end' or status <> 'cancel')"
,
nativeQuery
=
true
)
List
<
Contract
>
findByPlatformAndEmailStatus
(
String
platgorm
,
String
email
,
int
status
);
@Query
(
value
=
"select * from contract where contract_code =?2 and platform = ?1 "
,
nativeQuery
=
true
)
Contract
findOneByCode
(
String
platform
,
String
contractId
);
}
src/main/java/common/service/ContractService.java
View file @
6778b148
...
...
@@ -70,4 +70,6 @@ public interface ContractService {
List
<
ChangeDelDetail
>
getChangeDelDetailData
(
User
loginAccount
,
String
pid
);
ChangeDelInfo
changesDelRecover
(
String
id
,
String
type
,
User
loginAccount
);
Contract
findOne
(
User
loginAccount
,
String
startDate
,
String
endDate
,
String
platform
,
String
contractId
);
}
\ No newline at end of file
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
6778b148
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