From 58c3945eae6a067f2e81d350a2a57e7b48ee5a50 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 17 Dec 2024 18:46:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E7=A4=BA=E3=80=81=E5=A4=84=E7=90=86=E5=AE=8C?= =?UTF-8?q?=E6=AF=95=E5=A2=9E=E5=8A=A0=E6=9C=80=E6=96=B0=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AftersalesWorkOrderController.java | 11 ++++++++++- .../service/impl/AftersalesWorkOrderServiceImpl.java | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) 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);