fix(ymt & statist): 调整

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AlertStatisticsMapper.xml

@@ -364,6 +364,12 @@
         left join idx_biz_jg_use_info ibjui on ibjui.RECORD = a.equipment_id
         WHERE a.is_delete = 0 and a.father_alert is null
         and a.biz_org_code like concat(#{orgCode}, '%')
+        <if test="dto.superviseKey != null and dto.superviseKey != ''">
+            AND biz_org_code LIKE CONCAT(#{dto.superviseKey}, '%')
+        </if>
+        <if test="dto.region != null and dto.region != ''">
+            AND region_code LIKE CONCAT('%', #{dto.region}, '%')
+        </if>
         <if test="dto.workOrderNumber != null and dto.workOrderNumber != ''">
             AND a.work_order_number like
             CONCAT(CONCAT('%',#{dto.workOrderNumber}),'%')

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EmergencyBizServiceImpl.java

@@ -528,6 +528,9 @@ public class EmergencyBizServiceImpl {
 
     public Page<AlertCalledQueryDto> getAlertCalledRecords(Page<AlertCalledQueryDto> page, AlertCalledQueryDto alertCalledQueryDto, String cityCode) {
         String orgCode = getAndSetOrgCode(cityCode);
+        if (!ValidationUtil.isEmpty(alertCalledQueryDto.getRegion())) {
+            alertCalledQueryDto.setRegion(alertCalledQueryDto.getRegion().replace(",", "#"));
+        }
         return alertStatisticsMapper.getAlertCalledRecords(page, alertCalledQueryDto, orgCode);
     }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EnterpriseBizServiceImpl.java

@@ -63,7 +63,7 @@ public class EnterpriseBizServiceImpl {
 
     public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
         List<String> orgCodeList = new ArrayList<>();
-        if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
+        if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDto.getSuperviseKey())) {
             if(tzBaseEnterpriseInfoDto.getSuperviseKey().contains("_")){
                 String regionCode = tzBaseEnterpriseInfoDto.getSuperviseKey().split("_")[0];
                 String orgCode = stCommonService.getAndSetOrgCode(regionCode);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/AlertCalledQueryDto.java

@@ -90,4 +90,12 @@ public class AlertCalledQueryDto {
    @ApiModelProperty(value = "ID")
    private Long sequenceNbr;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "管辖机构")
+    private String superviseKey;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "所属区域")
+    private String region;
+
 }