diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java index b81bf7cf4..a6f8d7905 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java @@ -139,6 +139,11 @@ public class AftersalesAbnormalPackageEntity extends TenantEntity { */ @ApiModelProperty(value = "二级品") private String secondary; + /** + * 三级品 + */ + @ApiModelProperty(value = "三级品") + private String thirdProduct; /** * 入库批次号（库存品) */ diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java index 59e158c6f..f8bc575e2 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java @@ -217,6 +217,12 @@ public class AftersalesWorkOrderEntity extends TenantEntity { */ @ApiModelProperty(value = "仓库ID") private Long warehouseId; + + /** + * 仓库名称 + */ + @ApiModelProperty(value = "仓库名称") + private String warehouseName; /** * 责任人 （库内作业环节） */ @@ -290,6 +296,18 @@ public class AftersalesWorkOrderEntity extends TenantEntity { */ @ApiModelProperty(value = "提交人 ") private String ceator; + + /** + * 仓库客服 + */ + @ApiModelProperty(value = "仓库客服 ") + private String warehouseServiceName; + + /** + * 职能客服 + */ + @ApiModelProperty(value = "职能客服 ") + private String headquartersName; /** * 处理仓库ID */ diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesNewWorkOrderVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesNewWorkOrderVO.java new file mode 100644 index 000000000..4d98e1b36 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesNewWorkOrderVO.java @@ -0,0 +1,72 @@ +/* + * 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.vo; + +import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity; +import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity; +import com.logpm.aftersales.entity.AftersalesCompletionRecordEntity; +import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +/** + * 客服异常工单 视图实体类 + * + * @author BladeX + * @since 2023-11-17 + */ +@Data +public class AftersalesNewWorkOrderVO implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + private Integer workOrderType; + private Integer discoveryNode; + private String warehouseName; + private Integer workOrderStatus; + private String workOrderNumber; + private String waybillNumber; + private String orderCode; + private String packageCode; + private String brandName; + private String waybillMall; + private String first; + private String processedBy; + private String businessNames; + private String createTime; + private String overTime; + private String updateTime; + private String resultTypes; + private String totalAmountNum; + private String ceator; + private String endTime; + private String warehouseServiceName; + private String headquartersName; + private String isAppeal; + private String processNumber; + private String appealResult; + + + + + + +} 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 8a68fc6b2..f5c3683c7 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 @@ -124,16 +124,6 @@ public class AftersalesWorkOrderController extends BladeController { log.info("异常工单查询参数》》》{}",aftersalesWorkOrder); try{ IPage pages = aftersalesWorkOrderService.pageListOwn(aftersalesWorkOrder, Condition.getPage(query)); - -// R> data = R.data(AftersalesWorkOrderWrapper.build().pageVO(pages)); -// BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); -// if (ObjectUtils.isNotNull(myCurrentWarehouse)){ -// data.getData().getRecords().forEach(item -> { -// item.setTotalAmount(aftersalesCompletionRecordService.getTotalMoney(item,myCurrentWarehouse.getId())); -// }); -// }else{ -// log.info("查询人不属于某个仓库"); -// } return R.data(pages); }catch (Exception e){ log.error("工单查询系统异常》》》{}",e.getMessage()); 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 6688b96f6..7f4e95795 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 @@ -116,5 +116,5 @@ public interface AftersalesWorkOrderMapper extends BaseMapper exportAllListOwn(@Param("param")AftersalesWorkOrderEntity workOrderEntity); + List exportAllListOwn(@Param("param")AftersalesWorkOrderEntity workOrderEntity,@Param("ids")List ids); } 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 c753a16c3..a71d3906e 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 @@ -925,6 +925,12 @@ LEFT JOIN logpm_aftersales_person_responsible AS laprr ON laprr.word_order_id = lawo.id lawo.is_deleted = 0 + + AND lawo.id IN + + #{item} + + and lawo.work_order_status = #{param.workOrderStatusNameS } and lawo.id = #{param.id } and lawo.work_order_type = #{param.workOrderType } 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 d9c0167a7..e7da154f5 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 @@ -2580,8 +2580,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl exportWorkOrder(Map aftersalesWorkOrder) { String o = (String) aftersalesWorkOrder.get("ids"); + List ids = null; if (!Objects.isNull(o)) { - aftersalesWorkOrder.put("ids", o); + ids = Func.toLongList((String) aftersalesWorkOrder.get("ids")); } //查询用户角色信息 BladeUser user = AuthUtil.getUser(); @@ -2625,7 +2626,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl list = baseMapper.exportAllListOwn(workOrderEntity); + List list = baseMapper.exportAllListOwn(workOrderEntity,ids); return list;