售后导出修改提示、处理完毕增加最新回复内容字段导出

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<String> head3 = new ArrayList<>(Arrays.asList("理赔金额"));
 		basicTitle.add(head3);
+		List<String> head4 = new ArrayList<>(Arrays.asList("最新回复消息"));
+		basicTitle.add(head4);
 		List<AftersalesWorkOrderVO> 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);
 				}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -2807,10 +2807,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		if (ObjectUtil.isNotEmpty(workOrderDTO.getStartCreateTime()) || ObjectUtil.isNotEmpty(workOrderDTO.getEndCreateTime())) {
 			boolean withinOneMonth = DateUtil.between(workOrderDTO.getStartCreateTime(), workOrderDTO.getEndCreateTime(), DateUnit.DAY) <= 60;
 			if (!withinOneMonth) {
-				throw new ServiceException("创建日期不能超过两个月");
+				throw new ServiceException("日期范伟不能超过两个月");
 			}
 		} else {
-				throw new ServiceException("导出时配送日期必填");
+				throw new ServiceException("导出时日期必填");
 
 		}
 		List<AftersalesWorkOrderVO> exportData = baseMapper.getBasicExportData(workOrderDTO, ids, warehouseIds);