diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java index 8a0314a18..d21ede5c1 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -988,6 +988,8 @@ public class AftersalesWorkOrderController extends BladeController { basicTitle.add(head2); List head3 = new ArrayList<>(Arrays.asList("理赔金额")); basicTitle.add(head3); + List head4 = new ArrayList<>(Arrays.asList("最新回复消息")); + basicTitle.add(head4); List exportData = aftersalesWorkOrderService.getBasicExportData(aftersalesWorkOrder); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (!exportData.isEmpty()) { @@ -1026,8 +1028,15 @@ public class AftersalesWorkOrderController extends BladeController { data.add(17, exportDatum.getHeadquartersName()); data.add(18, exportDatum.getResultTypes()); data.add(19, exportDatum.getTotalAmountNum()); + data.add(20, ""); //查询此工单是否存在有责任方如果存在有责任方完善表头 - + AftersalesWorkOrderDTO workOrderDTO = new AftersalesWorkOrderDTO(); + workOrderDTO.setId(exportDatum.getId()); + AftersalesWorkOrderVO trackRecord = aftersalesWorkOrderService.getTrackRecord(workOrderDTO); + if (!Objects.isNull(trackRecord) && !Objects.isNull(trackRecord.getSurveyRecordEntities())){ + String processingResults = trackRecord.getSurveyRecordEntities().get(0).getProcessingResults(); + data.add(20, processingResults); + } if (personResponsibleMap!= null && !Objects.isNull(personResponsibleMap.get(exportDatum.getId()))) { handleResponsibility(basicTitle, personResponsibleMap.get(exportDatum.getId()), data); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index 8ac3a5ebb..025899693 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -2807,10 +2807,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl exportData = baseMapper.getBasicExportData(workOrderDTO, ids, warehouseIds);