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

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

@@ -130,7 +130,7 @@ public class AlertCalledDto  extends BaseDto {
     private String useSiteCategory;
 
     @ApiModelProperty(value = "电梯使用状态")
-    private Integer useStatus;
+    private String useStatus;
 
     // 废弃
     @ApiModelProperty(value = "警情地址")

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

@@ -55,11 +55,11 @@ public class AlertCalledQueryDto {
    @ApiModelProperty(value = "电梯地址")
    private String elevatorAddress;
 
-   @ExcelProperty(value = "所属区域", index = 7)
+   @ExcelIgnore
    @ApiModelProperty(value = "所属区域")
    private String district;
 
-   @ExcelIgnore
+   @ExcelProperty(value = "所属区域", index = 7)
    @ApiModelProperty(value = "市+区")
    private String address;
 

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

@@ -111,7 +111,7 @@ public class ElevatorDto extends BaseDto {
     private String dragModeName;
 
     @ApiModelProperty(value = "电梯使用状态")
-    private Integer useStatus;
+    private String useStatus;
 
     @ApiModelProperty(value = "电梯使用状态Str")
     private String useStatusStr;

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/AlertCalledController.java

@@ -195,7 +195,7 @@ public class AlertCalledController extends BaseController {
 		alertCalledDto.setAddress(elevator.getAddress());
 		alertCalledDto.setRegistrationCode(elevator.getRegisterCode());
 		alertCalledDto.setDeviceId(String.valueOf(elevator.getRescueCode()));
-		alertCalledDto.setUseStatus(elevator.getUseStatus());
+		alertCalledDto.setUseStatus(String.valueOf(elevator.getUseStatus()));
 		alertCalledDto.setUseSiteCategory(elevator.getUseSiteCategory());
 		alertCalledDto.setAlarmType(AlertStageEnums.getEnumById(alertCalledDto.getAlarmTypeCode()).getValue());
 		alertCalledDto.setEquipmentClassification("电梯");

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -165,7 +165,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 alertCalledDto.setProvince(String.valueOf(map.get("province")));
                 alertCalledDto.setCity(String.valueOf(map.get("city")));
                 alertCalledDto.setDistrict(String.valueOf(map.get("district")));
-                alertCalledDto.setUseStatus(Integer.valueOf(String.valueOf(map.get("useStatus"))));
+                alertCalledDto.setUseStatus(String.valueOf(map.get("useStatus")));
                 alertCalledDto.setUseSiteCategory(String.valueOf(map.get("useSiteCategory")));
                 alertCalledDto.setUseUnit(String.valueOf(map.get("useUnit")));
                 alertCalledDto.setRegionCode(String.valueOf(map.get("regionCode")));
@@ -244,7 +244,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             alertCalledDto.setProvince(elevator.getProvince());
             alertCalledDto.setCity(elevator.getCity());
             alertCalledDto.setDistrict(elevator.getDistrict());
-            alertCalledDto.setUseStatus(elevator.getUseStatus());
+            alertCalledDto.setUseStatus(String.valueOf(elevator.getUseStatus()));
             alertCalledDto.setUseSiteCategory(elevator.getUseSiteCategory());
             alertCalledDto.setUseUnit(elevator.getUseUnit());
             alertCalledDto.setRegionCode(elevator.getRegionCode());

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DispatchPaperServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.elevator.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -179,7 +180,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         Map<String,Object> map  = elevatorServiceImpl.selectByAlertId(alertId);
         if(!ObjectUtils.isEmpty(map.get("sequenceNbr"))) {
             List<Map<String,Object>> mapList = elevatorMapper.selectMtByAlertId(String.valueOf(map.get("sequenceNbr")));
-            if(!ObjectUtils.isEmpty(mapList)){
+            if(!ObjectUtils.isEmpty(mapList) && CollectionUtils.isEmpty(mapList)){
                 dispatchPaper.setRepairOrgCreditCode(String.valueOf(mapList.get(0).get("useCode")));
             }
         }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ElevatorServiceImpl.java

@@ -155,7 +155,7 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
         if(useSiteCategory != null) {
             elevatorDto.setUseSiteCategoryName(useSiteCategory.getName());
         }
-        if(elevatorDto.getUseStatus() == 1) {
+        if("1".equals(elevatorDto.getUseStatus())) {
             elevatorDto.setUseStatusStr("在用");
         } else {
             elevatorDto.setUseStatusStr("停用");