Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/AlertStatistics.java

@@ -92,11 +92,13 @@ public class AlertStatistics extends BaseEntity {
     /**
      * 平均救援时长（分钟）
      */
+    @TableField(exist = false)
     private String avgTime;
 
     /**
      * 30分钟内到达次数
      */
+    @TableField(exist = false)
     private Integer withinThirtyRescue;
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -445,9 +445,9 @@
         LEFT JOIN idx_biz_jg_register_info ri ON ri.USE_ORG_CODE=tjur.use_registration_code
         LEFT JOIN idx_biz_jg_use_info ui on ui."RECORD" = ri."RECORD"
         WHERE
-        ui."DATA_SOURCE" like 'jg_his%'
-        and ui."DATA_SOURCE" not like 'jg_his_black%'
-        and (ri."USE_ORG_CODE" is not null or ri."USE_ORG_CODE" != '')
+        ui.DATA_SOURCE like 'jg_his%'
+        and ui.DATA_SOURCE not like 'jg_his_black%'
+        and (ri.USE_ORG_CODE is not null or ri.USE_ORG_CODE != '')
         and tjur.is_delete=0
         and tjur.certificate_status='已登记'
         and tjur.use_unit_credit_code=#{useUnitCreditCode}