From 0941f0174515dc4b499278c3555dfc1a5f37d214 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Tue, 5 Dec 2023 21:30:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=92=89=E9=92=89=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=B7=E3=80=81=E5=AE=A1=E6=A0=B8=E4=BA=BA=E3=80=81?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AftersalesWorkOrderController.java | 20 +++++++++-- .../excel/AftersalesWorkOrderImporter.java | 17 ++++++++++ .../mapper/AftersalesWorkOrderMapper.java | 2 ++ .../mapper/AftersalesWorkOrderMapper.xml | 19 ++++++++++- .../service/IAftersalesWorkOrderService.java | 7 ++++ .../impl/AftersalesWorkOrderServiceImpl.java | 34 ++++++++++++++++++- 6 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderImporter.java 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 2e90d5161..b2e71408e 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 @@ -18,6 +18,7 @@ package com.logpm.aftersales.controller; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.aftersales.dto.AftersalesWorkOrderDTO; +import com.logpm.aftersales.excel.AftersalesWorkOrderImporter; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import io.swagger.annotations.Api; @@ -43,6 +44,7 @@ import com.logpm.aftersales.service.IAftersalesWorkOrderService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; +import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; import java.util.Map; @@ -172,10 +174,10 @@ public class AftersalesWorkOrderController extends BladeController { /** * 客服异常工单 查询处理结果信息数据 */ - @PostMapping("/getProcessingResults") + @GetMapping("/getProcessingResults") @ApiOperationSupport(order = 4) @ApiOperation(value = "客服异常工单 查询处理结果信息数据", notes = "传入aftersalesWorkOrder") - public R getProcessingResults(@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrder) { + public R getProcessingResults(AftersalesWorkOrderDTO aftersalesWorkOrder) { if(ObjectUtils.isNull(aftersalesWorkOrder.getId())){ return R.fail("异常工单ID不能为空！！"); } @@ -260,5 +262,19 @@ public class AftersalesWorkOrderController extends BladeController { ExcelUtil.export(response, "异常工单数据" + DateUtil.time(), "异常工单数据", list, AftersalesWorkOrderExcel.class); } + /** + * 导入 批量修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人 + */ + @PostMapping("/import-aftersalesWorkOrder") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "批量修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人", notes = "传入excel") + public R importWarehousingEntry(MultipartFile file, Integer isCovered) { + isCovered = 1; + AftersalesWorkOrderImporter userImporter = new AftersalesWorkOrderImporter(aftersalesWorkOrderService, isCovered == 1); + ExcelUtil.save(file, userImporter, AftersalesWorkOrderExcel.class); + return R.success("操作成功"); + } + + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderImporter.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderImporter.java new file mode 100644 index 000000000..ab674669e --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderImporter.java @@ -0,0 +1,17 @@ +package com.logpm.aftersales.excel; + +import com.logpm.aftersales.service.IAftersalesWorkOrderService; +import lombok.RequiredArgsConstructor; +import org.springblade.core.excel.support.ExcelImporter; + +import java.util.List; + +@RequiredArgsConstructor +public class AftersalesWorkOrderImporter implements ExcelImporter { + private final IAftersalesWorkOrderService service; + private final Boolean isCovered; + @Override + public void save(List data) { + service.importUser(data, isCovered); + } +} 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 4d56782f3..e52a645f7 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 @@ -67,4 +67,6 @@ public interface AftersalesWorkOrderMapper extends BaseMapper pageListOwn(IPage page,@Param("param") AftersalesWorkOrderEntity workOrderEntity); + + boolean updateList(@Param("list") List list); } 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 864fd094e..75d74ef30 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 @@ -57,6 +57,23 @@ from logpm_aftersales_work_order lawo + + + update logpm_aftersales_work_order + + process_number = #{item.processNumber }, + reviewed_by = #{item.reviewedBy }, + audit_time = #{item.auditTime }, + entry_time= #{item.entryTime }, + operator= #{item.operator }, + + WHERE `id` = #{ item.id } + + + + + + @@ -74,7 +91,7 @@ from logpm_aftersales_processor lap LEFT JOIN logpm_aftersales_work_order law on lap.work_order_id = law.id - lap.conditions != '3' and lap.is_deleted = 0 + lap.conditions != '3' and lap.is_deleted = 0 and law.id is not null and law.work_order_status = #{param.work_order_status} and lap.business_id = #{param.warehouseId} 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 6b10cd7f7..67a39b9a4 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 @@ -122,4 +122,11 @@ public interface IAftersalesWorkOrderService extends BaseService data, Boolean isCovered); } 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 d07582af0..cce96c7e7 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 @@ -494,7 +494,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl data, Boolean isCovered) { + if(!data.isEmpty()){ + BladeUser user = AuthUtil.getUser(); + + List list= new ArrayList<>(); + data.stream().forEach( k ->{ + //查询工单数据是否存在 + AftersalesWorkOrderEntity workOrder = baseMapper.selectOne(Wrappers.query().lambda() + .eq(AftersalesWorkOrderEntity::getWorkOrderNumber, k) + ); + if(ObjectUtils.isNull(workOrder)){ + throw new ServiceException(k+"不存在！！请确定！！"); + } + AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity(); + BeanUtil.copyProperties(k,workOrderEntity); + if(ObjectUtils.isNotNull( k.getEntryTime())){ + workOrderEntity.setOperator(user.getUserName()); + } + workOrderEntity.setId(workOrder.getId()); + list.add(workOrderEntity); + }); + if(!list.isEmpty()){ + baseMapper.updateList(list); + } + } + } + }