item：告警Log表属性扩展

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -373,4 +373,26 @@
 
         </sql>
     </changeSet>
+    <changeSet author="gaojianqiang" id="20221116-1152-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm_log" columnName="biz_org_name"/>
+            </not>
+        </preConditions>
+        <comment>新增属性字段 biz_org_name</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_specific_alarm_log` ADD COLUMN `biz_org_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机构/部门名称' AFTER `defect_batch_id`;
+        </sql>
+    </changeSet>
+    <changeSet author="gaojianqiang" id="20221116-1152-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm_log" columnName="biz_org_code"/>
+            </not>
+        </preConditions>
+        <comment>新增属性字段 biz_org_code</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_specific_alarm_log` ADD COLUMN `biz_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机构编码' AFTER `biz_org_name`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -282,11 +282,10 @@
             '%Y-%m-%d %H:%i:%s'
             ) createDate,
 	        wlesal.equipment_specific_name as equipmentSpecificName,
-	        wles.position,
-            wles.biz_org_code AS bizOrgCode,
-            wles.biz_org_name AS bizOrgName
+            wlesal.location,
+            wlesal.biz_org_code AS bizOrgCode,
+            wlesal.biz_org_name AS bizOrgName
         FROM wl_equipment_specific_alarm_log wlesal
-        LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
         <where>
             <if test="param.alarmType == 'BREAKDOWN'">AND wlesal.type = #{param.alarmType}</if>
             <if test="param.alarmType == 'FIREALARM'">AND wlesal.type = #{param.alarmType}</if>