96333救援时长修改

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

@@ -63,7 +63,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Date;
@@ -460,9 +459,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 //        FeignClientResult<List<AgencyUserModel>> userListResult = Privilege.agencyUserClient.list(null,null);
 //        FeignClientResult<List<AgencyUserModel>> userListResult = Privilege.agencyUserClient.queryByRoleId(dutySeatsRoleIds,null);
         ReginParams reginParams = citInfoService.getReginParams();
-        String RegionCode = reginParams.getCompany().getRegionCode();
+        String companyCode = reginParams.getCompany().getCompanyCode();
         LambdaQueryWrapper<TzsCitInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(TzsCitInfo::getRegionCode,RegionCode);
+        wrapper.eq(TzsCitInfo::getRegionCode, companyCode);
         List<TzsCitInfo> citInfoList = citInfoService.list(wrapper);
         List<TzsCitInfoDto> citInfoDtoList = new ArrayList<>();
         for(TzsCitInfo citInfo : citInfoList){

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/RescueProcessServiceImpl.java

@@ -16,10 +16,7 @@ import com.yeejoin.amos.boot.module.elevator.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchPaper;
 import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchTask;
-import com.yeejoin.amos.boot.module.elevator.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.elevator.api.entity.RescueProcess;
-import com.yeejoin.amos.boot.module.elevator.api.entity.RescueStation;
-import com.yeejoin.amos.boot.module.elevator.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.elevator.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.elevator.api.mapper.RescueProcessMapper;
 import com.yeejoin.amos.boot.module.elevator.api.service.IRescueProcessService;
@@ -104,7 +101,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
         }
         // 救援时长  用完成时间减去到达时间
         if(rescueTime != null && dispatchTime != null) {
-            String hms = DateUtils.getTimestr(rescueTime,dispatchTime);
+            String hms = DateUtils.getTimeDiffString(arriveTime, dispatchTime);
             rescueProcessDto.setArriveUseTime(hms);
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/service/impl/RescueProcessServiceImpl.java

@@ -92,7 +92,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
         Date rescueTime = rescueProcessDto.getRescueTime();
         if(arriveTime != null && dispatchTime != null) {
                 Long arriveTimes = arriveTime.getTime() - dispatchTime.getTime(); // 相差毫秒数
-                String hms = DateUtils.getTimestr(arriveTime,dispatchTime);
+                String hms = DateUtils.getTimeDiffString(arriveTime,dispatchTime);
                 rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
                 rescueProcessDto.setArriveUseTime(hms);
         }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/service/impl/RescueProcessServiceImpl.java

@@ -13,10 +13,7 @@ import com.yeejoin.amos.boot.module.jczs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jczs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jczs.api.entity.DispatchPaper;
 import com.yeejoin.amos.boot.module.jczs.api.entity.DispatchTask;
-import com.yeejoin.amos.boot.module.jczs.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.jczs.api.entity.RescueProcess;
-import com.yeejoin.amos.boot.module.jczs.api.entity.RescueStation;
-import com.yeejoin.amos.boot.module.jczs.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.jczs.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.jczs.api.mapper.RescueProcessMapper;
 import com.yeejoin.amos.boot.module.jczs.api.service.IRescueProcessService;
@@ -95,7 +92,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
         Date rescueTime = rescueProcessDto.getRescueTime();
         if(arriveTime != null && dispatchTime != null) {
                 Long arriveTimes = arriveTime.getTime() - dispatchTime.getTime(); // 相差毫秒数
-                String hms = DateUtils.getTimestr(arriveTime,dispatchTime);
+                String hms = DateUtils.getTimeDiffString(arriveTime,dispatchTime);
                 rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
                 rescueProcessDto.setArriveUseTime(hms);
         }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/RescueProcessServiceImpl.java

@@ -13,10 +13,7 @@ import com.yeejoin.amos.boot.module.tcm.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.tcm.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.tcm.api.entity.DispatchPaper;
 import com.yeejoin.amos.boot.module.tcm.api.entity.DispatchTask;
-import com.yeejoin.amos.boot.module.tcm.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.tcm.api.entity.RescueProcess;
-import com.yeejoin.amos.boot.module.tcm.api.entity.RescueStation;
-import com.yeejoin.amos.boot.module.tcm.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.tcm.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.RescueProcessMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.IRescueProcessService;
@@ -95,7 +92,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
         Date rescueTime = rescueProcessDto.getRescueTime();
         if(arriveTime != null && dispatchTime != null) {
                 Long arriveTimes = arriveTime.getTime() - dispatchTime.getTime(); // 相差毫秒数
-                String hms = DateUtils.getTimestr(arriveTime,dispatchTime);
+                String hms = DateUtils.getTimeDiffString(arriveTime,dispatchTime);
                 rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
                 rescueProcessDto.setArriveUseTime(hms);
         }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/RescueProcessServiceImpl.java

@@ -13,10 +13,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.ymt.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.ymt.api.entity.DispatchPaper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.DispatchTask;
-import com.yeejoin.amos.boot.module.ymt.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RescueProcess;
-import com.yeejoin.amos.boot.module.ymt.api.entity.RescueStation;
-import com.yeejoin.amos.boot.module.ymt.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.ymt.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RescueProcessMapper;
 import com.yeejoin.amos.boot.module.ymt.api.service.IRescueProcessService;
@@ -95,7 +92,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
         Date rescueTime = rescueProcessDto.getRescueTime();
         if(arriveTime != null && dispatchTime != null) {
                 Long arriveTimes = arriveTime.getTime() - dispatchTime.getTime(); // 相差毫秒数
-                String hms = DateUtils.getTimestr(arriveTime,dispatchTime);
+                String hms = DateUtils.getTimeDiffString(arriveTime,dispatchTime);
                 rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
                 rescueProcessDto.setArriveUseTime(hms);
         }