From ada760eeb2208064dc99ad6eecee5ed01afaca83 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Mon, 23 Dec 2024 14:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/equipment/EquipmentDeliveryController.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
index b44f3fb..f259d58 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
@@ -23,11 +23,9 @@ import com.njcn.csdevice.service.IMqttUserService;
 import com.njcn.csdevice.utils.ExcelStyleUtil;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.util.PoiUtil;
-import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.SysDicTreePO;
-import com.njcn.system.pojo.vo.DictTreeVO;
 import com.njcn.web.advice.DeviceLog;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.*;
@@ -176,6 +174,8 @@ public class EquipmentDeliveryController extends BaseController {
         for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : page.getRecords()){
             if(DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
                 csEquipmentDeliveryVO.setStatus(5);
+            } else if (DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 2) {
+                csEquipmentDeliveryVO.setStatus(6);
             }
         }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);