Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorMaintenanceInfoDto.java

@@ -15,15 +15,15 @@ import java.util.Date;
 public class ElevatorMaintenanceInfoDto {
 
     @ApiModelProperty(value = "最新维保日期")
-    private Date maintenanceTime;
+    private Date maintainTime;
 
     @ApiModelProperty(value = "下次维保日期")
-    private Date nextMaintenanceTime;
+    private Date nextMaintainTime;
 
     @ApiModelProperty(value = "维保单位")
-    private String maintenanceUnit;
+    private String maintainUnit;
 
     @ApiModelProperty(value = "维保人员")
-    private String maintenancePerson;
+    private String maintainPerson;
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java

@@ -300,17 +300,17 @@ public class ElevatorController extends BaseController {
         if(StringUtils.isBlank(rescueCode) && sequenceNbr == null) {
             throw new BadRequest("参数错误");
         }
-
+        Elevator elevator;
         ElevatorInfoDto elevatorInfoDto = new ElevatorInfoDto();
         if(null != sequenceNbr) {
             ElevatorBaseInfoDto baseInfoDto = new ElevatorBaseInfoDto();
-            Elevator elevator = elevatorService.getById(sequenceNbr);
+            elevator = elevatorService.getById(sequenceNbr);
             Bean.toPo(elevator,baseInfoDto);
             elevatorInfoDto.setElevatorBaseInfoDto(baseInfoDto);
         } else  {
             QueryWrapper<Elevator> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("rescue_code",rescueCode);
-            Elevator elevator = elevatorService.getOne(queryWrapper);
+            elevator = elevatorService.getOne(queryWrapper);
             if(null == elevator) {
                 throw new BadRequest("电梯应急救援码错误");
             }
@@ -320,7 +320,7 @@ public class ElevatorController extends BaseController {
         }
 
         QueryWrapper<MaintainInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enevator_id", null == sequenceNbr ? rescueCode : String.valueOf(sequenceNbr));
+        queryWrapper.eq("enevator_id", null == sequenceNbr ? elevator.getSequenceNbr() : String.valueOf(sequenceNbr));
         MaintainInfo maintainInfo =   maintainInfoService.getOne(queryWrapper);
         if(null != maintainInfo) {
             ElevatorMaintenanceInfoDto elevatorMaintenanceInfoDto = new ElevatorMaintenanceInfoDto();
@@ -329,7 +329,7 @@ public class ElevatorController extends BaseController {
         }
 
         QueryWrapper<TestInfo> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper.eq("enevator_id", null == sequenceNbr ? rescueCode : String.valueOf(sequenceNbr));
+        queryWrapper1.eq("enevator_id", null == sequenceNbr ? elevator.getSequenceNbr() : String.valueOf(sequenceNbr));
         TestInfo testInfo =   testInfoService.getOne(queryWrapper1);
         if(null != testInfo) {
             ElevatorTestInfoDto elevatorTestInfoDto = new ElevatorTestInfoDto();