Commit 8cb6bcfa authored by tangwei's avatar tangwei

修改bug

parent c67171f1
...@@ -22,7 +22,7 @@ public interface EquipmentMapper extends BaseMapper<Equipment> { ...@@ -22,7 +22,7 @@ public interface EquipmentMapper extends BaseMapper<Equipment> {
int getEquipmentCount(@Param("whereConditionStr") String whereConditionStr); int getEquipmentCount(@Param("whereConditionStr") String whereConditionStr);
EquipmentBaseAppVO getEquipmentAppMessage(String qrCode); EquipmentBaseAppVO getEquipmentAppMessage(@Param("qrCode") String qrCode);
List<ImportantEquipmentVO> getImportantEquipmentList(@Param("ids") List<Long> ids); List<ImportantEquipmentVO> getImportantEquipmentList(@Param("ids") List<Long> ids);
......
...@@ -1059,34 +1059,14 @@ ...@@ -1059,34 +1059,14 @@
<select id="getbyqrCode" resultType="com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO"> <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 SELECT
wl_signal_classify.type_name AS type, wl_signal_classify.type_name AS type,
( CASE WHEN d.update_date = NULL THEN d.create_date ELSE d.update_date END ) AS createDate ( CASE WHEN d.update_date = NULL THEN d.create_date ELSE d.update_date END ) AS createDate
FROM FROM
wl_equipment_specific_alarm d wl_equipment_specific_alarm d
LEFT JOIN wl_equipment_specific on wl_equipment_specific.id=d.equipment_specific_id 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 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 ORDER BY d.create_date ,d.update_date LIMIT 1
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment