From c1acfc513f2cb7a16bc3eb68e53f06b7a6c64fb8 Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Wed, 27 Mar 2024 10:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=86=92=E5=A4=A9=E6=95=B0=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/beidou/BeidouController.java      | 16 +++++++++-------
 .../taxationManage/TaxationManageMapper.xml      |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

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 @@
 		<if test="pd.TRANSPORT_ENTERPRISES != null and pd.TRANSPORT_ENTERPRISES != ''"><!-- 关键词检索 -->
 			and f.TRANSPORT_ENTERPRISES = #{pd.TRANSPORT_ENTERPRISES}
 		</if>
+		ORDER BY OPERATTIME DESC
 	</select>
 
 	<select id="listAll" parameterType="pd" resultType="pd">