Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
O
on-site-service
Project
Project
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
external
on-site-service
Commits
79b1a668
Commit
79b1a668
authored
Jul 26, 2022
by
lining
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 日期格式化
parent
bedc2e60
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
ServiceOrderMapper.xml
dao/src/main/resources/mapper/service/ServiceOrderMapper.xml
+2
-2
PageServiceOrderDTO.java
...ice/miniapp/controller/order/dto/PageServiceOrderDTO.java
+1
-1
No files found.
dao/src/main/resources/mapper/service/ServiceOrderMapper.xml
View file @
79b1a668
...
...
@@ -14,7 +14,7 @@
and valuator_id = #{userId}
</if>
<if
test=
"month != null and month != ''"
>
and date_format(create_time,'%Y%m') = #{month}
and date_format(create_time,'%Y
-
%m') = #{month}
</if>
<if
test=
"keyWord != null and keyWord != ''"
>
<bind
name=
"p1"
value=
"'%' + keyWord + '%'"
/>
...
...
@@ -33,7 +33,7 @@
#{orderStatus}
</foreach>
<if
test=
"month != null and month != ''"
>
and date_format(create_time,'%Y%m') = #{month}
and date_format(create_time,'%Y
-
%m') = #{month}
</if>
<if
test=
"keyWord != null and keyWord != ''"
>
<bind
name=
"p1"
value=
"'%' + keyWord + '%'"
/>
...
...
mini-app/src/main/java/com/onsiteservice/miniapp/controller/order/dto/PageServiceOrderDTO.java
View file @
79b1a668
...
...
@@ -28,7 +28,7 @@ public class PageServiceOrderDTO extends PageParams {
private
Integer
orderStatus
;
@ApiModelProperty
(
value
=
"月份"
)
@Size
(
min
=
6
,
max
=
6
,
message
=
"月份格式不正确[yyyy
MM]"
)
@Size
(
min
=
7
,
max
=
7
,
message
=
"月份格式不正确[yyyy-
MM]"
)
private
String
month
;
@ApiModelProperty
(
value
=
"模糊查询关键字,可输入客户名,服务地址,服务类型"
)
...
...
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