1.雀景页面左上角列表bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentAlarmController.java

@@ -255,7 +255,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request3.setValue(StringUtil.isNotEmpty(equipCode) ? StringUtils.trimToNull(equipCode) : null);
         queryRequests.add(request3);
         CommonRequest request6 = new CommonRequest();
-        // confirmType: '' 为全部数据 0 为未确认 1为已确认
+        // confirmType: '' 为全部数据 0 为未确认 1为已确认 2未消除 3已消除
         request6.setName("confirmType");
         request6.setValue(StringUtil.isNotEmpty(confirmType) ? StringUtils.trimToNull(confirmType) : null);
         queryRequests.add(request6);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -160,7 +160,6 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                 ent.setEquipmentSpecificId(alarmLog.getEquipmentSpecificId());
                 ent.setEquipmentSpecificIndexKey(alarmLog.getEquipmentSpecificIndexKey());
                 String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(alarmLog.getEquipmentSpecificId());
-                int i = 0 ; // 是否成功标识
                 if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.QRXC.getCode().equals(cleanType)) {
                     EquipmentSpecificAlarm alarm = equipmentSpecificAlarmMapper.selectById(alarmLog.getEquipmentSpecificAlarmId());
                     alarm.setStatus(AlarmStatusEnum.HF.getCode());

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -352,17 +352,6 @@
         LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id
         LEFT JOIN wl_equipment_specific wls ON wls.id = wlesal.equipment_specific_id
         <where>
-        <choose>
-            <when test="param.confirmType != null and param.confirmType == 0">
-                wlesal.confirm_type is NULL
-            </when>
-            <when test="param.confirmType != null and param.confirmType == 1">
-                wlesal.clean_time is NULL
-            </when>
-            <when test="param.confirmType == null">
-                wlesal.clean_time is NULL
-            </when>
-        </choose>
             <if test="param.bizOrgCode != null and param.bizOrgCode != ''">AND
                 wls.biz_org_code like  concat (#{param.bizOrgCode},'%')
             </if>