diff --git a/src/main/java/com/zcloud/controller/beidou/BeidouController.java b/src/main/java/com/zcloud/controller/beidou/BeidouController.java index f596990..2241261 100644 --- a/src/main/java/com/zcloud/controller/beidou/BeidouController.java +++ b/src/main/java/com/zcloud/controller/beidou/BeidouController.java @@ -152,14 +152,16 @@ public class BeidouController extends BaseController { operationData.put("OPERATING_ID", pd.get("VEHICLE")); operationData.put("CORPINFO_ID", pd.get("CORPINFO_ID")); PageData resData = operatingVehiclesService.findById(operationData); - String dueDate = pd.getString("DUE_DATE"); - String day = DateUtil.getDay(); - if(DateUtil.compareDate(dueDate, day)) { - resData.put("NETWORK_STATUS","已入网"); - }else{ - resData.put("NETWORK_STATUS","超时入网"); + if(!ObjectUtils.isEmpty(resData)) { + String dueDate = pd.getString("DUE_DATE"); + String day = DateUtil.getDay(); + if(DateUtil.compareDate(dueDate, day)) { + resData.put("NETWORK_STATUS","已入网"); + }else{ + resData.put("NETWORK_STATUS","超时入网"); + } + operatingVehiclesService.edit(resData); } - operatingVehiclesService.edit(resData); beidouService.edit(pd); map.put("pd", pd); map.put("result", errInfo); diff --git a/src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml b/src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml index b4bce37..6d3a2a1 100644 --- a/src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml +++ b/src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml @@ -428,6 +428,7 @@ and f.TRANSPORT_ENTERPRISES = #{pd.TRANSPORT_ENTERPRISES} + ORDER BY OPERATTIME DESC