Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bailuntec-cost
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
huluobin
bailuntec-cost
Commits
96ab7972
Commit
96ab7972
authored
Aug 26, 2021
by
liyanlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
72cc90f4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
ApprovalHistoryController.java
...her/module/cost/controller/ApprovalHistoryController.java
+2
-3
ApprovalHistoryReq.java
...blt/other/module/cost/dto/request/ApprovalHistoryReq.java
+2
-2
ApprovalHistoryMapper.xml
...rvice/src/main/resources/mapper/ApprovalHistoryMapper.xml
+4
-2
No files found.
cost-service/src/main/java/com/blt/other/module/cost/controller/ApprovalHistoryController.java
View file @
96ab7972
...
@@ -29,14 +29,13 @@ public class ApprovalHistoryController {
...
@@ -29,14 +29,13 @@ public class ApprovalHistoryController {
@ApiOperation
(
"获取审批历史列表"
)
@ApiOperation
(
"获取审批历史列表"
)
@GetMapping
@GetMapping
public
ApprovalHistoryResult
get
(
ApprovalHistoryReq
req
){
public
ApprovalHistoryResult
get
(
ApprovalHistoryReq
req
)
{
ApprovalHistoryResult
result
=
new
ApprovalHistoryResult
();
ApprovalHistoryResult
result
=
new
ApprovalHistoryResult
();
try
{
try
{
List
<
ApprovalHistoryVo
>
list
=
approvalHistoryService
.
getApprovalHistoryList
(
req
);
List
<
ApprovalHistoryVo
>
list
=
approvalHistoryService
.
getApprovalHistoryList
(
req
);
result
.
setSuccess
(
true
);
result
.
setSuccess
(
true
);
result
.
setList
(
list
);
result
.
setList
(
list
);
}
}
catch
(
Exception
ex
)
{
catch
(
Exception
ex
){
result
.
setSuccess
(
false
);
result
.
setSuccess
(
false
);
result
.
setMsg
(
ex
.
getMessage
());
result
.
setMsg
(
ex
.
getMessage
());
}
}
...
...
cost-service/src/main/java/com/blt/other/module/cost/dto/request/ApprovalHistoryReq.java
View file @
96ab7972
...
@@ -18,11 +18,11 @@ import java.time.LocalDateTime;
...
@@ -18,11 +18,11 @@ import java.time.LocalDateTime;
@ApiModel
(
"审批请求Model"
)
@ApiModel
(
"审批请求Model"
)
public
class
ApprovalHistoryReq
{
public
class
ApprovalHistoryReq
{
@ApiModelProperty
(
value
=
"审批时间-起始时间"
,
required
=
true
)
@ApiModelProperty
(
value
=
"审批时间-起始时间"
,
required
=
true
,
example
=
"2021-08-25 00:00:00"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
startTime
;
private
LocalDateTime
startTime
;
@ApiModelProperty
(
value
=
"审批时间-结束时间"
,
required
=
true
)
@ApiModelProperty
(
value
=
"审批时间-结束时间"
,
required
=
true
,
example
=
"2021-08-26 00:00:00"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
endTime
;
private
LocalDateTime
endTime
;
...
...
cost-service/src/main/resources/mapper/ApprovalHistoryMapper.xml
View file @
96ab7972
...
@@ -3,8 +3,10 @@
...
@@ -3,8 +3,10 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace=
"com.blt.other.module.cost.dao.ApprovalHistoryMapper"
>
<mapper
namespace=
"com.blt.other.module.cost.dao.ApprovalHistoryMapper"
>
<select
id=
"getApprovalHistoryList"
parameterType=
"com.blt.other.module.cost.dto.request.ApprovalHistoryReq"
resultType=
"com.blt.other.module.cost.vo.ApprovalHistoryVo"
>
<select
id=
"getApprovalHistoryList"
parameterType=
"com.blt.other.module.cost.dto.request.ApprovalHistoryReq"
select ah.id, ah.cost_no as costNo ,c.cost_form as costFrom,c.is_lend as isLend, s2.statusvalue as costStatus ,ah.is_passed as isPassed ,ah.approval_time as approvalTime ,c.type_name as typeName,u.username
resultType=
"com.blt.other.module.cost.vo.ApprovalHistoryVo"
>
select ah.id, ah.cost_no as costNo ,c.cost_form as costFrom,c.is_lend as isLend, s2.statusvalue as costStatus
,ah.is_passed as isPassed ,ah.approval_time as approvalTime ,c.type_name as typeName,u.username
from approval_history ah
from approval_history ah
left join cost c on c.cost_no = ah.cost_no
left join cost c on c.cost_no = ah.cost_no
left join `user` u on u.userid = ah.approval_user_id
left join `user` u on u.userid = ah.approval_user_id
...
...
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