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
955bd7d5
Commit
955bd7d5
authored
Aug 24, 2021
by
liyanlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
6b2d6a92
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
ApprovalHistoryReq.java
...blt/other/module/cost/dto/request/ApprovalHistoryReq.java
+4
-0
ApprovalHistoryMapper.xml
...rvice/src/main/resources/mapper/ApprovalHistoryMapper.xml
+1
-1
No files found.
cost-service/src/main/java/com/blt/other/module/cost/dto/request/ApprovalHistoryReq.java
View file @
955bd7d5
package
com
.
blt
.
other
.
module
.
cost
.
dto
.
request
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.time.LocalDateTime
;
...
...
@@ -17,9 +19,11 @@ import java.time.LocalDateTime;
public
class
ApprovalHistoryReq
{
@ApiModelProperty
(
value
=
"审批时间-起始时间"
,
required
=
true
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
startTime
;
@ApiModelProperty
(
value
=
"审批时间-结束时间"
,
required
=
true
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
endTime
;
@ApiModelProperty
(
"审批前费用单状态"
)
...
...
cost-service/src/main/resources/mapper/ApprovalHistoryMapper.xml
View file @
955bd7d5
...
...
@@ -9,6 +9,6 @@
left join `user` u on u.userid = ah.approval_user_id
where ah.approval_time between #{startTime} and #{endTime}
<if
test=
"costStatus != null"
>
and ah.cost_status = #{costStatus}
</if>
<if
test=
"typeNo != null
"
>
and ah
.type_no = #{typeNo}
</if>
<if
test=
"typeNo != null
and typeNo != ''"
>
and c
.type_no = #{typeNo}
</if>
</select>
</mapper>
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