修改车辆状态

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferCompanyResourcesServiceImpl.java

@@ -94,17 +94,25 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
         try {
 
             if (type == 2) {
+
+
                 powerTransferCompanyResources.setStatus(code);
                 powerTransferCompanyResources.setRemarks(remarks);
                 powerTransferCompanyResourcesMapper.updateById(powerTransferCompanyResources);
-                List<Object> carStatusInfoDtoList = new ArrayList();
-                //修改装备信息
-                CarStatusInfoDto carStatusInfo = new CarStatusInfoDto();
-                carStatusInfo.setSequenceNbr(carId + "");
-                carStatusInfo.setStatus(FireCarStatusEnum.执勤.getCode());
-                carStatusInfoDtoList.add(carStatusInfo);
-                // 更新所有车辆状态为执勤
-                equipFeignClient.updateCarStatus(carStatusInfoDtoList);
+
+                if("finished".equals(code)){
+                    List<Object> carStatusInfoDtoList = new ArrayList();
+                    //修改装备信息
+                    CarStatusInfoDto carStatusInfo = new CarStatusInfoDto();
+                    carStatusInfo.setSequenceNbr(carId + "");
+                    carStatusInfo.setStatus(FireCarStatusEnum.执勤.getCode());
+                    carStatusInfoDtoList.add(carStatusInfo);
+                    // 更新所有车辆状态为执勤
+                    equipFeignClient.updateCarStatus(carStatusInfoDtoList);
+                }
+
+
+
             } else {
                 if (FireCarStatusEnum.到场.getCode().equals(code)){
                     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");