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
8cb6bcfa
Commit
8cb6bcfa
authored
Apr 28, 2022
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
c67171f1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
22 deletions
+2
-22
EquipmentMapper.java
.../java/com/yeejoin/equipmanage/mapper/EquipmentMapper.java
+1
-1
EquipmentSpecificAlarmMapper.xml
...rc/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
+1
-21
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentMapper.java
View file @
8cb6bcfa
...
...
@@ -22,7 +22,7 @@ public interface EquipmentMapper extends BaseMapper<Equipment> {
int
getEquipmentCount
(
@Param
(
"whereConditionStr"
)
String
whereConditionStr
);
EquipmentBaseAppVO
getEquipmentAppMessage
(
String
qrCode
);
EquipmentBaseAppVO
getEquipmentAppMessage
(
@Param
(
"qrCode"
)
String
qrCode
);
List
<
ImportantEquipmentVO
>
getImportantEquipmentList
(
@Param
(
"ids"
)
List
<
Long
>
ids
);
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @
8cb6bcfa
...
...
@@ -1059,26 +1059,6 @@
<select
id=
"getbyqrCode"
resultType=
"com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO"
>
-- SELECT
-- (
-- CASE
--
-- WHEN d.type = 'FIREALARM' THEN
-- '火警'
-- WHEN d.type = 'BREAKDOWN' THEN
-- '故障'
-- WHEN d.type = 'SHIELD' THEN
-- '屏蔽'
-- WHEN d.type = 'NOTICE' THEN
-- '预警' ELSE ''
--
-- END
-- ) AS type,
-- ( CASE WHEN d.update_date = NULL THEN d.create_date ELSE d.update_date END ) AS createDate
-- FROM
-- wl_equipment_specific_alarm d LEFT JOIN wl_equipment_specific on wl_equipment_specific.id=d.equipment_specific_id
-- where wl_equipment_specific.qr_code=#{code}
-- ORDER BY d.create_date ,d.update_date LIMIT 1
SELECT
wl_signal_classify.type_name AS type,
( CASE WHEN d.update_date = NULL THEN d.create_date ELSE d.update_date END ) AS createDate
...
...
@@ -1086,7 +1066,7 @@
wl_equipment_specific_alarm d
LEFT JOIN wl_equipment_specific on wl_equipment_specific.id=d.equipment_specific_id
LEFT JOIN wl_signal_classify on wl_signal_classify.type_code=d.type
where wl_equipment_specific.qr_code
=
#{code}
where wl_equipment_specific.qr_code
=
#{code}
ORDER BY d.create_date ,d.update_date LIMIT 1
</select>
...
...
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