修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -1456,11 +1456,7 @@ public class CommandController extends BaseController {
             Long carid = Long.valueOf(pw.get(0).getResourcesId());
             //获取正在进行的灾情
             powerTransferCompanyResources = powerTransferCompanyResourcesService.getByAlertCalledIdCarId(alertCalledId, carid);
-
             // 随车人员
-            //  List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(carid);
-
-
             List<Map<String, Object>> equipmentList = iDutyCarService.getDutyCaruser(carid);
 
             if (!ValidationUtil.isEmpty(equipmentList)) {
@@ -1468,9 +1464,9 @@ public class CommandController extends BaseController {
                 String newStr = "";
                 for (int i = 0; i < equipmentList.size(); i++) {
                     if (i == equipmentList.size() - 1) {
-                        newStr = str.concat(equipmentList.get(i).get("userName") + "");
+                        newStr =newStr+ str.concat(equipmentList.get(i).get("userName") + "");
                     } else {
-                        newStr = str.concat(equipmentList.get(i).get("userName") + ",");
+                        newStr = newStr+str.concat(equipmentList.get(i).get("userName") + ",");
                     }
                 }
                 powerTransferCompanyResources.setPw(newStr);
@@ -1484,33 +1480,34 @@ public class CommandController extends BaseController {
                 powerTransferCompanyResources.setTaskInformation(powerData.getTaskInformation());
             }
         } else {
-            ResponseModel<Map<String, Object>> equipmentIndexDto = equipFeignClient.getCarDetailByCarNum(id);
+           ResponseModel<Map<String, Object>> equipmentIndexDto = equipFeignClient.getCarDetailByCarNum(id);
             if (equipmentIndexDto.getResult().size() == 0) {
                 return ResponseHelper.buildResponse(null);
             }
-
-//            LambdaQueryWrapper<PowerTransferCompanyResources> queryWrapper = new LambdaQueryWrapper<>();
-//            queryWrapper.eq(PowerTransferCompanyResources::getResourcesNum,id);
-//            powerTransferCompanyResources = powerTransferCompanyResourcesMapper.selectOne(queryWrapper);
             if (!ValidationUtil.isEmpty(equipmentIndexDto.getResult())) {
                 Map<String, Object> map = equipmentIndexDto.getResult();
                 // 随车人员
-                List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(Long.valueOf(map.get("id").toString()));
+                List<Map<String, Object>> equipmentList = iDutyCarService.getDutyCaruser(Long.valueOf(map.get("id").toString()));
                 powerTransferCompanyResources.setResourcesName(map.get("name").toString());
                 powerTransferCompanyResources.setResourcesNum(map.get("carNum").toString());
 
-                if (!ValidationUtil.isEmpty(powerDataOne)) {
+              if (!ValidationUtil.isEmpty(equipmentList)) {
                     String str = "";
                     String newStr = "";
-                    for (int i = 0; i < powerDataOne.size(); i++) {
-                        newStr = str.concat(powerDataOne.get(i).getPostTypeName()).concat(":").concat(powerDataOne.get(i).getUser());
+                    for (int i = 0; i < equipmentList.size(); i++) {
+                        if (i == equipmentList.size() - 1) {
+                            newStr = newStr+str.concat(equipmentList.get(i).get("userName") + "");
+                        } else {
+                            newStr =newStr+ str.concat(equipmentList.get(i).get("userName") + ",");
+                        }
                     }
                     powerTransferCompanyResources.setPw(newStr);
                 } else {
                     powerTransferCompanyResources.setPw("无");
                 }
+
                 powerTransferCompanyResources.setStatusName("无任务");
-                powerTransferCompanyResources.setCarStatusName(FireCarStatusEnum.getEnum(map.get("carState").toString()).getName());
+                powerTransferCompanyResources.setCarStatusName("执勤");
                 powerTransferCompanyResources.setTaskInformation("无");
             }
         }