Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
9a5d3f08
Commit
9a5d3f08
authored
Dec 19, 2022
by
suhuiguang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop_dl_plan6_temp' of…
Merge branch 'develop_dl_plan6_temp' of
http://39.98.45.134:8090/moa/amos-boot-biz
into develop_dl_plan6_temp
parents
ed9c0061
73669075
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
0 deletions
+16
-0
CheckInfoPageParam.java
...eejoin/amos/patrol/business/param/CheckInfoPageParam.java
+4
-0
dbTemplate_check.xml
...-patrol/src/main/resources/db/mapper/dbTemplate_check.xml
+12
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/CheckInfoPageParam.java
View file @
9a5d3f08
...
@@ -105,5 +105,9 @@ public class CheckInfoPageParam extends CommonPageable{
...
@@ -105,5 +105,9 @@ public class CheckInfoPageParam extends CommonPageable{
private
String
bizOrgCode
;
private
String
bizOrgCode
;
private
String
searchDay
;
}
}
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml
View file @
9a5d3f08
...
@@ -108,6 +108,12 @@
...
@@ -108,6 +108,12 @@
<if
test=
"bizOrgCode != null and bizOrgCode != ''"
>
<if
test=
"bizOrgCode != null and bizOrgCode != ''"
>
and a.org_code LIKE CONCAT(#{bizOrgCode},'%')
and a.org_code LIKE CONCAT(#{bizOrgCode},'%')
</if>
</if>
<if
test=
"searchDay != null and searchDay != ''"
>
and date_format(
a.check_time,
'%Y-%m-%d'
) = curdate()
</if>
</trim>
</trim>
</select>
</select>
...
@@ -311,6 +317,12 @@
...
@@ -311,6 +317,12 @@
<if
test=
"bizOrgCode != null and bizOrgCode != ''"
>
<if
test=
"bizOrgCode != null and bizOrgCode != ''"
>
and a.org_code LIKE CONCAT(#{bizOrgCode},'%')
and a.org_code LIKE CONCAT(#{bizOrgCode},'%')
</if>
</if>
<if
test=
"searchDay != null and searchDay != ''"
>
and date_format(
a.check_time,
'%Y-%m-%d'
) = curdate()
</if>
</trim>
</trim>
order by ${orderBy}
order by ${orderBy}
<choose>
<choose>
...
...
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