修改设备告警查询条件

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

@@ -106,11 +106,17 @@ public class EquipmentAlarmController extends AbstractBaseController {
         List<CommonRequest> queryRequests = new ArrayList<>();
         CommonRequest request = new CommonRequest();
         request.setName("beginDate");
-        request.setValue(StringUtil.isNotEmpty(beginDate) ? StringUtils.trimToNull(beginDate).substring(0, 10) + " 00:00:00" : null);
+        request.setValue(beginDate);
+        if (StringUtil.isNotEmpty(beginDate) && StringUtils.trimToNull(beginDate).length() == 10) {
+            request.setValue(StringUtils.trimToNull(beginDate).substring(0, 10) + " 00:00:00");
+        }
         queryRequests.add(request);
         CommonRequest request1 = new CommonRequest();
         request1.setName("endDate");
-        request1.setValue(StringUtil.isNotEmpty(endDate) ? StringUtils.trimToNull(endDate).substring(0, 10) + " 23:59:59" : null);
+        request1.setValue(endDate);
+        if (StringUtil.isNotEmpty(endDate) && StringUtils.trimToNull(endDate).length() == 10) {
+            request1.setValue(StringUtils.trimToNull(endDate).substring(0, 10) + " 23:59:59");
+        }
         queryRequests.add(request1);
         CommonRequest request2 = new CommonRequest();
         request2.setName("warehouseStructureName");
@@ -402,28 +408,28 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request13.setName("isRemovedFire");
         request13.setValue(StringUtil.isNotEmpty(isRemovedFire) ? StringUtils.trimToNull(isRemovedFire) : null);
         queryRequests.add(request13);
-      
+
         CommonRequest request15 = new CommonRequest();
         request15.setName("equipDetailCode");
         request15.setValue(StringUtil.isNotEmpty(equipDetailCode) ? StringUtils.trimToNull(equipDetailCode) : null);
         queryRequests.add(request15);
-        
+
         CommonRequest request16 = new CommonRequest();
         request16.setName("specificIndexKey");
         request16.setValue(StringUtil.isNotEmpty(specificIndexKey) ? StringUtils.trimToNull(specificIndexKey) : null);
         queryRequests.add(request16);
-        
+
         CommonRequest request17 = new CommonRequest();
         request17.setName("indexTypeCode");
         request17.setValue(StringUtil.isNotEmpty(indexTypeCode) ? StringUtils.trimToNull(indexTypeCode) : null);
         queryRequests.add(request17);
-        
+
         CommonRequest request18 = new CommonRequest();
         request18.setName("equipmentCode");
         request18.setValue(StringUtil.isNotEmpty(equipmentCode) ? StringUtils.trimToNull(equipmentCode) : null);
         queryRequests.add(request18);
-      
-       
+
+
         if (equioEnabled){
             if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())){
                 CommonRequest request14 = new CommonRequest();

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

@@ -226,8 +226,9 @@
             </if>
             <if test="param.beginDate!=null">AND wlesal.create_date <![CDATA[>=]]> #{param.beginDate}</if>
             <if test="param.endDate!=null">AND wlesal.create_date <![CDATA[<=]]> #{param.endDate}</if>
-            <if test="param.alarmType == 'BREAKDOWN'">AND wlesal.type = #{param.alarmType}</if>
-            <if test="param.alarmType == 'FIREALARM'">AND wlesal.type = #{param.alarmType}</if>
+            <if test="param.alarmType != null and param.alarmType != ''">
+                AND UPPER(wlesal.type) = UPPER(#{param.alarmType})
+            </if>
             <if test="param.isFireAlarm == 'false'">AND wlesal.type != 'FIREALARM'</if>
             <if test="param.orgCode != null and param.orgCode != ''">AND wlesal.org_code = #{param.orgCode}</if>
             <if test="param.type != null and param.type != ''">AND wlesal.type = #{param.type}</if>
@@ -1510,7 +1511,7 @@
         ORDER BY
             `result`.`click_date`
     </select>
-    
+
     <select id="pressureMessage" resultType="java.util.Map">
         select
             (
@@ -1560,8 +1561,8 @@
                                     and wes.biz_org_code like concat(#{orgCode}, "%")
                                 </if>
                     ) as startNum) as startNum
-    </select>     
-         
+    </select>
+
     <select id="stationInfo" resultType="java.util.Map">
         SELECT
             a.`name`,