Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
6f18ef81
Commit
6f18ef81
authored
Sep 24, 2024
by
李秀明
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: BUG#30727 演练报告,点击演练报告,查看到的演练报告列表,列表不支持点击排序
parent
862fe30f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
2 deletions
+22
-2
PlanReport.java
...main/java/com/yeejoin/amos/fas/dao/entity/PlanReport.java
+6
-0
PlanReportMapper.xml
...ysStart/src/main/resources/db/mapper/PlanReportMapper.xml
+16
-2
No files found.
YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/PlanReport.java
View file @
6f18ef81
...
...
@@ -77,4 +77,10 @@ public class PlanReport extends BaseEntity {
@TableField
(
exist
=
false
)
private
String
equipName
;
@TableField
(
exist
=
false
)
private
String
sortField
;
@TableField
(
exist
=
false
)
private
String
sortOrder
;
}
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanReportMapper.xml
View file @
6f18ef81
...
...
@@ -79,8 +79,22 @@
AND #{endDate} >= a.drill_date
</if>
</where>
order by a.create_date desc
LIMIT #{pageNumber},#{pageSize}
ORDER BY
<if
test=
"sortField != null and sortField != '' and sortOrder != null and sortOrder != ''"
>
<choose>
<when
test=
"sortOrder == 'ascend'"
>
a.${sortField} ASC
</when>
<otherwise>
a.${sortField} DESC
</otherwise>
</choose>
</if>
<if
test=
"sortField == null or sortField == ''"
>
a.create_date DESC
</if>
LIMIT
#{pageNumber},#{pageSize}
</select>
<select
id=
"getById"
resultType=
"com.yeejoin.amos.fas.dao.entity.PlanReport"
>
...
...
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