From 7a7ca141361d2e7d25adeee2a01f8e4b2aa94646 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 28 May 2024 14:20:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/AftersaleSurveyRecordEntity.java | 4 + .../aftersales/vo/AftersalesProcessorVO.java | 2 + .../AftersalesWorkOrderController.java | 10 ++ .../dto/AftersalesWorkOrderListExcelDTO.java | 43 +++++++ .../mapper/AftersalesWorkOrderMapper.java | 7 ++ .../mapper/AftersalesWorkOrderMapper.xml | 115 ++++++++++++++++++ .../service/IAftersalesWorkOrderService.java | 5 + .../impl/AftersalesWorkOrderServiceImpl.java | 23 ++++ 8 files changed, 209 insertions(+) create mode 100644 blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderListExcelDTO.java diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersaleSurveyRecordEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersaleSurveyRecordEntity.java index af8e51b14..2bad6d597 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersaleSurveyRecordEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersaleSurveyRecordEntity.java @@ -127,5 +127,9 @@ public class AftersaleSurveyRecordEntity extends TenantEntity { * 处理方ID */ private Long processorId; + /** + * 处理方名称 + */ + private String processorName; } diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessorVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessorVO.java index e90d70ab0..ba68a8298 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessorVO.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessorVO.java @@ -32,4 +32,6 @@ import lombok.EqualsAndHashCode; public class AftersalesProcessorVO extends AftersalesProcessorEntity { private static final long serialVersionUID = 1L; + + } 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 3af0c2f46..a3556288d 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 @@ -19,6 +19,7 @@ package com.logpm.aftersales.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.aftersales.dto.AftersalesWorkOrderDTO; +import com.logpm.aftersales.dto.AftersalesWorkOrderListExcelDTO; import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity; import com.logpm.aftersales.entity.AftersalesAppealEntity; import com.logpm.aftersales.entity.AftersalesSettlementEntity; @@ -719,6 +720,15 @@ public class AftersalesWorkOrderController extends BladeController { ExcelUtil.export(response, "异常工单数据" + DateUtil.time(), "异常工单数据", list, AftersalesWorkOrderExcel.class); } + @GetMapping("/exportAftersalesWorkOrderList") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesWorkOrder") + public void exportAftersalesWorkOrderList(HttpServletResponse response) { + + AftersalesWorkOrderListExcelDTO aftersalesWorkOrderListExcelDTO = aftersalesWorkOrderService.exportAftersalesWorkOrderList(); +// ExcelUtil.export(response, "异常工单数据" + DateUtil.time(), "异常工单数据", list, AftersalesWorkOrderExcel.class); + } + /** * 导入 批量修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人 */ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderListExcelDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderListExcelDTO.java new file mode 100644 index 000000000..30a6dde1c --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderListExcelDTO.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.*; +import com.logpm.aftersales.excel.AftersalesWorkOrderExcel; +import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +/** + * 客服异常工单 数据传输对象实体类 + * + * @author BladeX + * @since 2023-11-17 + */ +@Data +public class AftersalesWorkOrderListExcelDTO implements Serializable { + private static final long serialVersionUID = 1L; + + + + private List aftersalesWorkOrderExcels; + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java index be15ea6d1..0928abf36 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java @@ -101,4 +101,11 @@ public interface AftersalesWorkOrderMapper extends BaseMapper getListSettlementNew(IPage page,@Param("param") AftersalesSettlementEntity aftersalesSettlementEntity); + + + List selectAllAftersalesWorkOrderList(@Param("warehouseIds")List warehouseListIds); + + + List selectWaitAftersalesWorkOrderList(@Param("warehouseIds")List warehouseListIds); + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml index a73c52e03..8bcf5ba0d 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml @@ -52,6 +52,9 @@ + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java index b33abea7c..b6e0cc890 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java @@ -18,6 +18,7 @@ package com.logpm.aftersales.service; import com.logpm.aftersales.dto.AftersalesPackageScanDTO; import com.logpm.aftersales.dto.AftersalesWorkOrderDTO; +import com.logpm.aftersales.dto.AftersalesWorkOrderListExcelDTO; import com.logpm.aftersales.entity.AftersalesAppealEntity; import com.logpm.aftersales.entity.AftersalesSettlementEntity; import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; @@ -295,4 +296,8 @@ public interface IAftersalesWorkOrderService extends BaseService surveyRecordEntity.setProcessorId(aftersalesProcessorEntity.getId())); surveyRecordEntity.setAddDepartment(myCurrentWarehouse.getDepartmentName()); surveyRecordEntity.setProcessingResults(surveyRecordEntity.getContent()); + surveyRecordEntity.setProcessorId(user.getUserId()); + surveyRecordEntity.setProcessorName(user.getNickName()); } else { log.info("客服回复！！！{}", user.getUserName()); surveyRecordEntity.setProcessorId(user.getUserId()); + surveyRecordEntity.setProcessorName(user.getNickName()); R deptName = sysClient.getDeptName(Long.valueOf(user.getDeptId())); surveyRecordEntity.setAddDepartment(deptName.getData()); surveyRecordEntity.setProcessingResults(surveyRecordEntity.getContent()); @@ -2324,5 +2329,23 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl warehouseList = warehouseClient.getMyWarehouseList(); + List warehouseListIds = null; + if (!warehouseList.isEmpty()){ + warehouseListIds = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); + } + AftersalesWorkOrderListExcelDTO aftersalesWorkOrderListExcelDTO = new AftersalesWorkOrderListExcelDTO(); + List allAftersalesWorkOrderExcels = baseMapper.selectAllAftersalesWorkOrderList(warehouseListIds); + if (!allAftersalesWorkOrderExcels.isEmpty()) { + aftersalesWorkOrderListExcelDTO.setAftersalesWorkOrderExcels(allAftersalesWorkOrderExcels); + } + List waitAftersalesWorkOrderExcels = baseMapper.selectWaitAftersalesWorkOrderList(warehouseListIds); + + + return null; } }