Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageInfoParam.java

@@ -84,6 +84,16 @@ public class CommonPageInfoParam extends CommonPageable {
 
 	private String orgCode;
 
+	private Long alarmLogId;
+
+	public Long getAlarmLogId() {
+		return alarmLogId;
+	}
+
+	public void setAlarmLogId(Long alarmLogId) {
+		this.alarmLogId = alarmLogId;
+	}
+
 	/**
 	 * 筛选条件-告警类型
 	 */

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageParamUtil.java

@@ -73,6 +73,8 @@ public class CommonPageParamUtil {
 				param.setFireEquipmentSpecificIndexKey(toString(queryRequests.get(i).getValue()));
 			} else if("indexTypeCode".equals(name)){
 				param.setIndexTypeCode(toString(queryRequests.get(i).getValue()));
+			} else if ("alarmLogId".equals(name)) {
+				param.setAlarmLogId(toLong(queryRequests.get(i).getValue()));
 			}
 		}
 		if(commonPageable !=null){

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

@@ -353,7 +353,7 @@
         	<if test="param.bizOrgCode != null and param.bizOrgCode != ''">AND
                 wls.biz_org_code like  concat (#{param.bizOrgCode},'%')
             </if>
-            <if test="param.alarmLogId != null">AND
+            <if test="param.alarmLogId != null">
                 and wlesal.id = #{alarmLogId}
             </if>
             <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">