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
7b13465e
Commit
7b13465e
authored
Jul 21, 2022
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
40229882
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
CommonPageParamUtil.java
...yeejoin/equipmanage/common/utils/CommonPageParamUtil.java
+2
-0
EquipmentSpecificAlarmMapper.xml
...rc/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
+2
-2
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageParamUtil.java
View file @
7b13465e
...
...
@@ -67,6 +67,8 @@ public class CommonPageParamUtil {
param
.
setEquipmentCode
(
toString
(
queryRequests
.
get
(
i
).
getValue
()));
}
else
if
(
"specificIndexKey"
.
equals
(
name
)){
param
.
setFireEquipmentSpecificIndexKey
(
toString
(
queryRequests
.
get
(
i
).
getValue
()));
}
else
if
(
"indexTypeCode"
.
equals
(
name
)){
param
.
setIndexTypeCode
(
toString
(
queryRequests
.
get
(
i
).
getValue
()));
}
}
if
(
commonPageable
!=
null
){
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @
7b13465e
...
...
@@ -370,8 +370,8 @@
<if
test=
"param.equipmentCode != null and param.equipmentCode != ''"
>
AND d.equipmentCode like concat(concat("%",#{param.equipmentCode}),"%")
</if>
<if
test=
"param.indexTypeCode != null and param.indexTypeCode != ''"
>
AND
AND d.type =
=
#{param.indexTypeCode}
<if
test=
"param.indexTypeCode != null and param.indexTypeCode != ''"
>
AND d.type = #{param.indexTypeCode}
</if>
<if
test=
"param.fireEquipmentSpecificIndexKey != null and param.fireEquipmentSpecificIndexKey != ''"
>
AND d.fireEquipmentSpecificIndexKey like concat(concat("%",#{param.fireEquipmentSpecificIndexKey}),"%")
...
...
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