Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/pom.xml

@@ -23,5 +23,13 @@
         </dependency>
     </dependencies>
 
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.7.8</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -528,19 +528,20 @@
 		SELECT
 		a.sequence_nbr AS alertId,
 		a.region_code AS regionCode,
-		e.rescue_code AS rescueCode,
+		ibjoi.CODE96333 AS rescueCode,
 		a.alarm_type_code AS alarmTypeCode,
 		a.alarm_type AS alarmType,
-		CONCAT(e.province ,e.city ,e.district) AS area,
+		CONCAT(ibjui.PROVINCE_NAME ,ibjui.CITY_NAME ,ibjui.COUNTY_NAME) AS area,
 		a.address AS address,
 		a.call_time AS callTime,
-		e.longitude AS longitude,
-		e.latitude AS latitude,
+		ifnull ( ibjui."LONGITUDE_LATITUDE"::json->> 'latitude', null ) AS latitude,
+		ifnull ( ibjui."LONGITUDE_LATITUDE"::json->> 'longitude', null ) AS longitude,
 		a.alert_stage AS alertStatus,
-		e.sequence_nbr AS elevatorId,
-		e.register_code AS elevatorCode
+		ibjui.RECORD AS elevatorId,
+		ibjoi.SUPERVISORY_CODE AS elevatorCode
 		FROM tz_alert_called a
-		LEFT JOIN tcb_elevator e ON e.sequence_nbr = a.equipment_id
+		LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjoi.RECORD = a.equipment_id
+		LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.RECORD = ibjoi.RECORD
 		WHERE a.is_delete = 0
 		<choose>
 			<when test="isHistory == true">
@@ -560,7 +561,6 @@
 			</foreach>
 		</if>
 		order by a.call_time desc
-
 	</select>