Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCustomerMallEntity.java

@@ -34,6 +34,29 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @ApiModel(value = "AftersalesCustomerMall对象", description = "异常工单商场对应客服")
 @EqualsAndHashCode(callSuper = true)
 public class AftersalesCustomerMallEntity extends TenantEntity {
-
+	/**
+	 *
+	 */
+	private Long customerServiceId;
+	/**
+	 *
+	 */
+	private Long clientId;
+	/**
+	 *
+	 */
+	private String customerServiceName;
+	/**
+	 *
+	 */
+	private String clientName;
+	/**
+	 * 类型 1 职能客服 2 仓库客服
+	 */
+	private String typesOf;
+	/**
+	 *  状态 1 正常
+	 */
+	private String conditions;
 
 }

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesPersonResponsibleEntity.java

@@ -82,9 +82,9 @@ public class AftersalesPersonResponsibleEntity extends TenantEntity {
 	@ApiModelProperty(value = "责任比例")
 	private String responsibilityRatio;
 	/**
-	 * 类型
+	 * 类型 1 正常  2三方责任人
 	 */
-	@ApiModelProperty(value = "类型")
+	@ApiModelProperty(value = "类型 1 正常  2三方责任人")
 	private String typesOf;
 	/**
 	 * 区别
@@ -101,6 +101,11 @@ public class AftersalesPersonResponsibleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "说明")
 	private String description;
+	/**
+	 * 三方预计责任人
+	 */
+	@ApiModelProperty(value = "三方预计责任人")
+	private String tripartite;
 	/**
 	 * 责任方ID
 	 */

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesReplyingPartyEntity.java

@@ -0,0 +1,115 @@
+/*
+ *      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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
+
+/**
+ * 异常工单沟通回复方 实体类
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+@Data
+@TableName("logpm_aftersales_replying_party")
+@ApiModel(value = "AftersalesReplyingParty对象", description = "异常工单沟通回复方")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesReplyingPartyEntity extends TenantEntity {
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 异常工单ID
+	 */
+	@ApiModelProperty(value = "异常工单ID")
+	private Long workOrderId;
+	/**
+	 * 处理人ID
+	 */
+	@ApiModelProperty(value = "处理人ID")
+	private Long processedById;
+	/**
+	 * 处理人名称
+	 */
+	@ApiModelProperty(value = "处理人名称")
+	private Long processedByName;
+	/**
+	 * 指派时间
+	 */
+	private Date assignTime;
+
+	/**
+	 * 指定的跟进仓库ID
+	 */
+	@ApiModelProperty(value = "指定的跟进仓库ID")
+	private Long followWarehouseId;
+	/**
+	 * 指定的跟进仓库名称
+	 */
+	@ApiModelProperty(value = "指定的跟进仓库名称")
+	private String followWarehouseName;
+	/**
+	 * 类型 1 正常
+	 */
+	@ApiModelProperty(value = "类型 1 正常")
+	private String typesOf;
+	/**
+	 * 处理方ID
+	 */
+	@ApiModelProperty(value = "处理方ID")
+	private Long processorId;
+	/**
+	 * 类状态 1未回复 2 已回复
+	 */
+	@ApiModelProperty(value = "状态 1未回复 2 已回复")
+	private String difference;
+	/**
+	 * 调查记录ID
+	 */
+	@ApiModelProperty(value = "调查记录ID")
+	private Long surveyRecordId;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesReplyingPartyClient.java

@@ -0,0 +1,49 @@
+/*
+ *      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.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesReplyingPartyEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常工单沟通回复方 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+@FeignClient(
+    value = "blade-aftersalesReplyingParty"
+)
+public interface IAftersalesReplyingPartyClient {
+
+    String API_PREFIX = "/replyingParty/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取异常工单沟通回复方列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesReplyingPartyEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java

@@ -43,6 +43,9 @@ public class AftersalesAbnormalPackageVO extends AftersalesAbnormalPackageEntity
 	private String workOrderNumber;//异常工单编号
 	private String firsts; //一级品
 	private String second; //二级品
+	private String mallName; //客户名称
+	private Long mallId; //客户ID
+	private String typeServiceName; //客户服务类型名称
 
 
 

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesReplyingPartyVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.AftersalesReplyingPartyEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单沟通回复方 视图实体类
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesReplyingPartyVO extends AftersalesReplyingPartyEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java

@@ -23,6 +23,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 门店业务记录 Feign接口类
  *
@@ -36,6 +38,7 @@ public interface IBasicdataStoreBusinessClient {
 
     String API_PREFIX = "/client";
     String TOP = API_PREFIX + "/t11op";
+    String GETCLIENTID = API_PREFIX + "/clientId";
 
     /**
      * 获取门店业务记录列表
@@ -50,4 +53,12 @@ public interface IBasicdataStoreBusinessClient {
 	@GetMapping(API_PREFIX+"/findByClientIdAndTypeService")
     BasicdataStoreBusinessEntity findByClientIdAndTypeService(@RequestParam Long clientEntityId,@RequestParam Integer typeService);
 
+	/**
+	 * 查询商场服务类型
+	 *
+	 * @param clientId
+	 * @return
+	 */
+	@GetMapping(GETCLIENTID)
+	List<BasicdataStoreBusinessEntity> findByClientIdList(@RequestParam Long clientId);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesReplyingPartyController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesReplyingPartyEntity;
+import com.logpm.aftersales.vo.AftersalesReplyingPartyVO;
+import com.logpm.aftersales.excel.AftersalesReplyingPartyExcel;
+import com.logpm.aftersales.wrapper.AftersalesReplyingPartyWrapper;
+import com.logpm.aftersales.service.IAftersalesReplyingPartyService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常工单沟通回复方 控制器
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-aftersalesReplyingParty/aftersalesReplyingParty")
+@Api(value = "异常工单沟通回复方", tags = "异常工单沟通回复方接口")
+public class AftersalesReplyingPartyController extends BladeController {
+
+	private final IAftersalesReplyingPartyService aftersalesReplyingPartyService;
+
+	/**
+	 * 异常工单沟通回复方 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesReplyingParty")
+	public R<AftersalesReplyingPartyVO> detail(AftersalesReplyingPartyEntity aftersalesReplyingParty) {
+		AftersalesReplyingPartyEntity detail = aftersalesReplyingPartyService.getOne(Condition.getQueryWrapper(aftersalesReplyingParty));
+		return R.data(AftersalesReplyingPartyWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常工单沟通回复方 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesReplyingParty")
+	public R<IPage<AftersalesReplyingPartyVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesReplyingParty, Query query) {
+		IPage<AftersalesReplyingPartyEntity> pages = aftersalesReplyingPartyService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesReplyingParty, AftersalesReplyingPartyEntity.class));
+		return R.data(AftersalesReplyingPartyWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常工单沟通回复方 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesReplyingParty")
+	public R<IPage<AftersalesReplyingPartyVO>> page(AftersalesReplyingPartyVO aftersalesReplyingParty, Query query) {
+		IPage<AftersalesReplyingPartyVO> pages = aftersalesReplyingPartyService.selectAftersalesReplyingPartyPage(Condition.getPage(query), aftersalesReplyingParty);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常工单沟通回复方 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesReplyingParty")
+	public R save(@Valid @RequestBody AftersalesReplyingPartyEntity aftersalesReplyingParty) {
+		return R.status(aftersalesReplyingPartyService.save(aftersalesReplyingParty));
+	}
+
+	/**
+	 * 异常工单沟通回复方 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesReplyingParty")
+	public R update(@Valid @RequestBody AftersalesReplyingPartyEntity aftersalesReplyingParty) {
+		return R.status(aftersalesReplyingPartyService.updateById(aftersalesReplyingParty));
+	}
+
+	/**
+	 * 异常工单沟通回复方 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesReplyingParty")
+	public R submit(@Valid @RequestBody AftersalesReplyingPartyEntity aftersalesReplyingParty) {
+		return R.status(aftersalesReplyingPartyService.saveOrUpdate(aftersalesReplyingParty));
+	}
+
+	/**
+	 * 异常工单沟通回复方 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesReplyingPartyService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesReplyingParty")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesReplyingParty")
+	public void exportAftersalesReplyingParty(@ApiIgnore @RequestParam Map<String, Object> aftersalesReplyingParty, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesReplyingPartyEntity> queryWrapper = Condition.getQueryWrapper(aftersalesReplyingParty, AftersalesReplyingPartyEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesReplyingParty::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesReplyingPartyEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesReplyingPartyExcel> list = aftersalesReplyingPartyService.exportAftersalesReplyingParty(queryWrapper);
+		ExcelUtil.export(response, "异常工单沟通回复方数据" + DateUtil.time(), "异常工单沟通回复方数据表", list, AftersalesReplyingPartyExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -198,9 +198,6 @@ public class AftersalesWorkOrderController extends BladeController {
 		if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getId())){
 			throw new ServiceException("异常工单ID不能为空");
 		}
-		if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getProcessorEntityList())){
-			throw new ServiceException("处理方信息不能为空");
-		}
 
 		return R.status(aftersalesWorkOrderService.savaSurveyRecord(aftersalesWorkOrderDTO));
 	}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesReplyingPartyDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.AftersalesReplyingPartyEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单沟通回复方 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesReplyingPartyDTO extends AftersalesReplyingPartyEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesReplyingPartyExcel.java

@@ -0,0 +1,44 @@
+/*
+ *      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.excel;
+
+
+import lombok.Data;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 异常工单沟通回复方 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersalesReplyingPartyExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesReplyingPartyClient.java

@@ -0,0 +1,53 @@
+/*
+ *      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.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.aftersales.entity.AftersalesReplyingPartyEntity;
+import com.logpm.aftersales.service.IAftersalesReplyingPartyService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 异常工单沟通回复方 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class AftersalesReplyingPartyClient implements IAftersalesReplyingPartyClient {
+
+    private final IAftersalesReplyingPartyService aftersalesReplyingPartyService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<AftersalesReplyingPartyEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<AftersalesReplyingPartyEntity> page = aftersalesReplyingPartyService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml

@@ -37,11 +37,12 @@
     </select>
     <select id="getAbnormalPackage" resultType="com.logpm.aftersales.vo.AftersalesAbnormalPackageVO">
         select ldpl.order_package_code packageCode  ,ldpl.waybill_number waybillNumber,ldpl.order_code orderCode,ldpl.waybill_id waybillId,ldpl.stock_article_id orderId,
-        lawo.work_order_number workOrderNumber,lawo.id workOrderId,ldsa.brand brandName,ldpl.firsts,ldpl.second
+        lawo.work_order_number workOrderNumber,lawo.id workOrderId,ldsa.brand brandName,ldpl.firsts,ldpl.second,ldsa.mall_name mallName,ldsa.mall_id mallId
         from  logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_aftersales_abnormal_package laap  on laap.package_code = ldpl.order_package_code
         LEFT JOIN logpm_aftersales_work_order lawo on laap.work_order_id = lawo.id
         LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
+        LEFT JOIN logpm_basicdata_client lbc on lbc.id = ldsa.mall_id
         <where>
             ldpl. is_deleted = 0
             <if test="param.packageCode != null and param.packageCode != ''"> and ldpl.order_package_code =#{param.packageCode } </if>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesReplyingPartyMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      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.mapper;
+
+import com.logpm.aftersales.entity.AftersalesReplyingPartyEntity;
+import com.logpm.aftersales.vo.AftersalesReplyingPartyVO;
+import com.logpm.aftersales.excel.AftersalesReplyingPartyExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 异常工单沟通回复方 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+public interface AftersalesReplyingPartyMapper extends BaseMapper<AftersalesReplyingPartyEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersalesReplyingParty
+	 * @return
+	 */
+	List<AftersalesReplyingPartyVO> selectAftersalesReplyingPartyPage(IPage page, AftersalesReplyingPartyVO aftersalesReplyingParty);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersalesReplyingPartyExcel> exportAftersalesReplyingParty(@Param("ew") Wrapper<AftersalesReplyingPartyEntity> queryWrapper);
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesReplyingPartyMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.aftersales.mapper.AftersalesReplyingPartyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="aftersalesReplyingPartyResultMap" type="com.logpm.aftersales.entity.AftersalesReplyingPartyEntity">
+    </resultMap>
+
+
+    <select id="selectAftersalesReplyingPartyPage" resultMap="aftersalesReplyingPartyResultMap">
+        select * from logpm_aftersales_replying_party where is_deleted = 0
+    </select>
+
+
+    <select id="exportAftersalesReplyingParty" resultType="com.logpm.aftersales.excel.AftersalesReplyingPartyExcel">
+        SELECT * FROM logpm_aftersales_replying_party ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -51,10 +51,11 @@
     </resultMap>
     <!--查询完整的异常工单信息-->
     <select id="pageListOwn" resultType="com.logpm.aftersales.entity.AftersalesWorkOrderEntity">
-        select lawo.id,lawo.work_order_type,lawo.discovery_node,lawo.work_order_number,lawo.waybill_number,lawo.order_code,lawo.train_number,lawo.first,
+        select DISTINCT lawo.id,lawo.work_order_type,lawo.discovery_node,lawo.work_order_number,lawo.waybill_number,lawo.order_code,lawo.train_number,lawo.first,
                lawo.secondary,lawo.vehicle_route,lawo.deliver_goods_time,lawo.discovery_time,lawo.warehousing_time,lawo.waybill_mall,lawo.remarks,lawo.delivery_time,
-               lawo.delivery_driver,lawo.work_order_status,lawo.problem_description,lawo.responsible_person,lawo.processed_by
+               lawo.delivery_driver,lawo.work_order_status,lawo.problem_description,lawo.responsible_person,lawo.processed_by,lawo.create_time
         from logpm_aftersales_work_order lawo
+        LEFT JOIN logpm_aftersales_processor lap on lawo.id = lap.work_order_id and lap.types_of = '2' and lap.conditions in (1,2)
         <where>
             <if test="param.id != null and param.id != '' ">and  lawo.id = #{param.id } </if>
             <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
@@ -94,8 +95,9 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.investigationProcess != null and param.investigationProcess != '' ">and  lawo.investigation_process = #{param.investigationProcess } </if>
             <if test="param.relatedWorkOrdersId != null and param.relatedWorkOrdersId != '' ">and  lawo.related_work_orders_id = #{param.relatedWorkOrdersId } </if>
             <if test="param.customerIdentification != null and param.customerIdentification == 1 ">
-                     and  lawo.work_order_status in  ('30','40','50','60','70','80','90') and lawo.customer_service_id is null
+                     and  lawo.work_order_status in  ('10','20','30','40','50','60','70','80','90') and lawo.customer_service_id is null
             </if>
+            ORDER BY lawo.create_time DESC
         </where>
 
     </select>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesReplyingPartyService.java

@@ -0,0 +1,52 @@
+/*
+ *      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.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.aftersales.entity.AftersalesReplyingPartyEntity;
+import com.logpm.aftersales.vo.AftersalesReplyingPartyVO;
+import com.logpm.aftersales.excel.AftersalesReplyingPartyExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 异常工单沟通回复方 服务类
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+public interface IAftersalesReplyingPartyService extends BaseService<AftersalesReplyingPartyEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersalesReplyingParty
+	 * @return
+	 */
+	IPage<AftersalesReplyingPartyVO> selectAftersalesReplyingPartyPage(IPage<AftersalesReplyingPartyVO> page, AftersalesReplyingPartyVO aftersalesReplyingParty);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersalesReplyingPartyExcel> exportAftersalesReplyingParty(Wrapper<AftersalesReplyingPartyEntity> queryWrapper);
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java

@@ -25,6 +25,7 @@ import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
 import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.User;
 
@@ -241,4 +242,15 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @return
 	 */
 	R updateAssignArbitrateService(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
+
+
+
+	/**
+	 * 客服异常工单 处理完结指派客服信息
+	 *
+	 * @param aftersalesWorkOrderDTO
+	 */
+	void addAssignCustomerService(AftersalesWorkOrderDTO aftersalesWorkOrderDTO, BladeUser user);
+
+
 }

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

@@ -23,10 +23,15 @@ import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel;
 import com.logpm.aftersales.mapper.AftersalesAbnormalPackageMapper;
 import com.logpm.aftersales.service.IAftersalesAbnormalPackageService;
+import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataClientClient;
+import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import lombok.AllArgsConstructor;
+import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.system.cache.DictBizCache;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -45,6 +50,7 @@ import java.util.Map;
 public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl<AftersalesAbnormalPackageMapper, AftersalesAbnormalPackageEntity> implements IAftersalesAbnormalPackageService {
 
 	private final IBasicdataWarehouseClient warehouseClient;
+	private final IBasicdataStoreBusinessClient basicdataStoreBusinessClient;
 
 	@Override
 	public IPage<AftersalesAbnormalPackageVO> selectAftersalesAbnormalPackagePage(IPage<AftersalesAbnormalPackageVO> page, AftersalesAbnormalPackageVO aftersalesAbnormalPackage) {
@@ -75,8 +81,22 @@ public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl<Afters
 		if(ObjectUtils.isNotNull(myCurrentWarehouse)){
 			aftersalesAbnormalPackageEntity.setWarehouseId(myCurrentWarehouse.getId());
 		}
-
-		return baseMapper.getAbnormalPackage(aftersalesAbnormalPackageEntity);
+		List<AftersalesAbnormalPackageVO> abnormalPackage = baseMapper.getAbnormalPackage(aftersalesAbnormalPackageEntity);
+		abnormalPackage.forEach(i ->{
+			//查询客户合作信息
+			if(ObjectUtils.isNotNull(i.getMallId())){
+				List<BasicdataStoreBusinessEntity> byClientIdList = basicdataStoreBusinessClient.findByClientIdList(i.getMallId());
+				if(!byClientIdList.isEmpty()){
+					StringBuffer stringBu = new StringBuffer();
+					byClientIdList.forEach(a ->{
+						String value = DictBizCache.getValue( DictBizConstant.DISTRIBUTION_TYPE,a.getTypeService());
+						stringBu.append(value);
+					});
+					i.setTypeServiceName(stringBu.toString());
+				}
+			}
+		});
+		return abnormalPackage;
 
 	}
 

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

@@ -0,0 +1,54 @@
+/*
+ *      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.service.impl;
+
+import com.logpm.aftersales.entity.AftersalesReplyingPartyEntity;
+import com.logpm.aftersales.vo.AftersalesReplyingPartyVO;
+import com.logpm.aftersales.excel.AftersalesReplyingPartyExcel;
+import com.logpm.aftersales.mapper.AftersalesReplyingPartyMapper;
+import com.logpm.aftersales.service.IAftersalesReplyingPartyService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 异常工单沟通回复方 服务实现类
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+@Service
+public class AftersalesReplyingPartyServiceImpl extends BaseServiceImpl<AftersalesReplyingPartyMapper, AftersalesReplyingPartyEntity> implements IAftersalesReplyingPartyService {
+
+	@Override
+	public IPage<AftersalesReplyingPartyVO> selectAftersalesReplyingPartyPage(IPage<AftersalesReplyingPartyVO> page, AftersalesReplyingPartyVO aftersalesReplyingParty) {
+		return page.setRecords(baseMapper.selectAftersalesReplyingPartyPage(page, aftersalesReplyingParty));
+	}
+
+
+	@Override
+	public List<AftersalesReplyingPartyExcel> exportAftersalesReplyingParty(Wrapper<AftersalesReplyingPartyEntity> queryWrapper) {
+		List<AftersalesReplyingPartyExcel> aftersalesReplyingPartyList = baseMapper.exportAftersalesReplyingParty(queryWrapper);
+		//aftersalesReplyingPartyList.forEach(aftersalesReplyingParty -> {
+		//	aftersalesReplyingParty.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesReplyingParty.getType()));
+		//});
+		return aftersalesReplyingPartyList;
+	}
+
+}

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

@@ -18,7 +18,6 @@ package com.logpm.aftersales.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -35,7 +34,6 @@ import com.logpm.aftersales.service.*;
 import com.logpm.aftersales.vo.*;
 import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.logpm.aftersales.mapper.AftersalesWorkOrderMapper;
-import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.feign.IDistributionDeliveryListClient;
@@ -59,6 +57,7 @@ import org.springblade.system.entity.DictBiz;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserSearchClient;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -94,11 +93,12 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	private final IAftersalesArbitrationOrderService aftersalesArbitrationOrderService;
 	private final IAftersaleSurveyRecordService aftersaleSurveyRecordService;
 	private final IAftersalesPersonResponsibleService aftersalesPersonResponsibleService;
+	private final IAftersalesReplyingPartyService aftersalesReplyingPartyService;
 
 	private final IBasicdataWarehouseClient warehouseClient;
 
 	private final IDistributionDeliveryListClient distributionDeliveryListClient;
-
+	private final IAftersalesCustomerMallService aftersalesCustomerMallService;
 
 	private final   ISysClient sysClient;
 
@@ -278,6 +278,16 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				aftersalesAbnormalPackageService.saveBatch(list);
 			}
 		}
+		AftersaleSurveyRecordEntity aftersaleSurveyRecord = new AftersaleSurveyRecordEntity();
+		//添加调查记录
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getSurveyRecordDTO())){
+			AftersaleSurveyRecordDTO surveyRecordDTO = changName(aftersalesWorkOrder, user);
+			BeanUtil.copyProperties(surveyRecordDTO,aftersaleSurveyRecord);
+			aftersaleSurveyRecord.setTypesOf("1");
+			aftersaleSurveyRecord.setDifference("1");
+			aftersaleSurveyRecord.setWorkOrderId(aftersalesWorkOrder.getId());
+			aftersaleSurveyRecordService.save(aftersaleSurveyRecord);
+		}
 		//添加责任方 处理方
 		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getProcessorEntityList())){
 			//责任方 处理方
@@ -294,11 +304,14 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				}else{
 					list.add(processor);
 				}
-
+				aftersalesProcessorService.save(processor);
+				if(ProcessorTypesOfStatusConstant.chulifang.getValue().equals(i.getTypesOf())){
+					AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrder, processor, aftersaleSurveyRecord);
+					//添加待回复信息
+					aftersalesReplyingPartyService.save(replyingPartyEntity);
+				}
 			});
-			if(!list.isEmpty()){
-				aftersalesProcessorService.saveBatch(list);
-			}
+
 		}
 		//添加图片信息
 		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getDecreaseImageEntityList())){
@@ -316,16 +329,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			}
 
 		}
-		//添加调查记录
-		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getSurveyRecordDTO())){
-			AftersaleSurveyRecordDTO surveyRecordDTO = changName(aftersalesWorkOrder, user);
-			AftersaleSurveyRecordEntity aftersaleSurveyRecord = new AftersaleSurveyRecordEntity();
-			BeanUtil.copyProperties(surveyRecordDTO,aftersaleSurveyRecord);
-			aftersaleSurveyRecord.setTypesOf("1");
-			aftersaleSurveyRecord.setDifference("1");
-			aftersaleSurveyRecord.setWorkOrderId(aftersalesWorkOrder.getId());
-			aftersaleSurveyRecordService.save(aftersaleSurveyRecord);
-		}
 		//添加责任人信息
 		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getPersonResponsibleDTO()) && !aftersalesWorkOrder.getPersonResponsibleDTO().isEmpty()){
 			List<AftersalesPersonResponsibleEntity> personResponsibleList = getAftersalesPersonResponsibleEntities(aftersalesWorkOrder);
@@ -366,10 +369,35 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				completionRecordService.saveBatch(collect1);
 			}
 //			completionRecordService.saveBatch(aftersalesWorkOrder.getCompletionRecordEntities());
+		}
+		//添加处理结果
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getAftersalesProcessingResultsDTO())){
+			addProcessingResults(aftersalesWorkOrder);
 		}
 			return  true;
 	}
 
+	/**
+	 * 回复信息添加
+	 * @param aftersalesWorkOrder
+	 * @param processor
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	@NotNull
+	private static AftersalesReplyingPartyEntity getPartyEntity(AftersalesWorkOrderDTO aftersalesWorkOrder, AftersalesProcessorEntity processor, AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		AftersalesReplyingPartyEntity replyingPartyEntity = new AftersalesReplyingPartyEntity();
+		replyingPartyEntity.setWorkOrderId(aftersalesWorkOrder.getId());
+		replyingPartyEntity.setProcessorId(processor.getId());
+		replyingPartyEntity.setAssignTime(new Date());
+		replyingPartyEntity.setSurveyRecordId(aftersaleSurveyRecord.getId());
+		replyingPartyEntity.setFollowWarehouseId(processor.getBusinessId());
+		replyingPartyEntity.setFollowWarehouseName(processor.getBusinessName());
+		replyingPartyEntity.setTypesOf("1");
+		replyingPartyEntity.setDifference("1");
+		return replyingPartyEntity;
+	}
+
 	/**
 	 * 查询调查记录的部分信息
 	 * @param aftersalesWorkOrder
@@ -401,8 +429,12 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		personResponsibleDTO.forEach( i ->{
 			AftersalesPersonResponsibleEntity personResponsibleEntity = new AftersalesPersonResponsibleEntity();
 			BeanUtil.copyProperties(i , personResponsibleEntity);
+			if(ObjectUtils.isNotNull(personResponsibleEntity.getPersonResponsibleId()) ){
+				personResponsibleEntity.setTypesOf("1");
+			}else{
+				personResponsibleEntity.setTypesOf("2");
+			}
 			personResponsibleEntity.setDifference("1");
-			personResponsibleEntity.setTypesOf("1");
 			personResponsibleEntity.setWordOrderId(aftersalesWorkOrder.getId());
 			personResponsibleList.add(personResponsibleEntity);
 		});
@@ -1136,57 +1168,114 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		BladeUser user = AuthUtil.getUser();
 		//查询处理方信息
-		AftersalesProcessorEntity one = aftersalesProcessorService.getOne(Wrappers.<AftersalesProcessorEntity>query().lambda()
-			.eq(AftersalesProcessorEntity::getBusinessName, myCurrentWarehouse.getName())
-			.eq(AftersalesProcessorEntity::getWorkOrderId,aftersalesWorkOrderDTO.getId())
-			.eq(AftersalesProcessorEntity::getBusinessId, myCurrentWarehouse.getId())
-			.eq(AftersalesProcessorEntity::getTypesOf, ProcessorTypesOfStatusConstant.chulifang.getValue())
-		);
-		if(ObjectUtils.isNull(one)){
-			throw new ServiceException("处理方信息不存在！！");
-		}
-		//修改处理方 处理状态
-		updateProcessor(ProcessorProcessingStatusStatusConstant.yichuli.getValue(),one);
-
-		//查询所有处理方
+		//查询所有待处理方
 		List<AftersalesProcessorEntity> list = aftersalesProcessorService.list(Wrappers.<AftersalesProcessorEntity>query().lambda()
 			.eq(AftersalesProcessorEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId())
 			.eq(AftersalesProcessorEntity::getTypesOf,ProcessorTypesOfStatusConstant.chulifang.getValue())
 		);
-		//添加或修改新的处理方
-		List<AftersalesProcessorEntity> processorEntityList = new ArrayList<>();
-		aftersalesWorkOrderDTO.getProcessorEntityList().forEach( i ->{
-			Optional<AftersalesProcessorEntity> first = list.stream().filter(a -> a.getBusinessId().equals(i.getBusinessId())).findFirst();
-
-			if(first.isPresent()){
-				//修改处理方 处理状态
-				updateProcessor(ProcessorProcessingStatusStatusConstant.daichuli.getValue(),first.get());
-			}else{
-				//不存在 添加处理方信息
-				AftersalesProcessorEntity processor = addProcessor(aftersalesWorkOrderDTO, myCurrentWarehouse, i);
-				processor.setConditions(ProcessorConditionsStatusConstant.xinzeng.getValue());
-				processor.setAssignTime(new Date());
-				processorEntityList.add(processor);
-			}
-			//添加指定处理结果
-			//处理方
-			addSurveRecord(aftersalesWorkOrderDTO, user, i);
-		});
-		//添加处理方
-		if(!processorEntityList.isEmpty()){
-			aftersalesProcessorService.saveBatch(processorEntityList);
-		}
+		Optional<AftersalesProcessorEntity> one = list.stream().filter(i -> i.getBusinessId().equals(myCurrentWarehouse.getId()) && i.getBusinessName().equals(myCurrentWarehouse.getName())).findFirst();
 		//添加回复信息
 		AftersaleSurveyRecordDTO surveyRecordDTO = aftersalesWorkOrderDTO.getSurveyRecordDTO();
 		AftersaleSurveyRecordEntity surveyRecordEntity = new AftersaleSurveyRecordEntity();
 		BeanUtil.copyProperties(surveyRecordDTO,surveyRecordEntity);
-		surveyRecordEntity.setProcessorId(one.getId());
+		if(one.isPresent()){
+			surveyRecordEntity.setProcessorId(one.get().getId());
+		}
 		surveyRecordEntity.setDifference("1");
+		surveyRecordEntity.setAddPeople(user.getUserName());
+		surveyRecordEntity.setAddDepartment(myCurrentWarehouse.getName());
 		aftersaleSurveyRecordService.save(surveyRecordEntity);
+		//是否处理
+		if(!one.isPresent()){
+
+			//不是处理方
+			if(aftersalesWorkOrderDTO.getProcessorEntityList().isEmpty()){
+				//没有 全部
+				List<AftersalesProcessorEntity> collect = list.stream().filter(i -> "1".equals(i.getProcessingStatus())).collect(Collectors.toList());
+				//添加待回复信息
+				collect.forEach( i ->{
+
+					AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordEntity);
+					//添加待回复信息
+					aftersalesReplyingPartyService.save(replyingPartyEntity);
+				});
+
+			}else{
+				//添加或修改新的处理方
+				chuLiFang(aftersalesWorkOrderDTO, myCurrentWarehouse, user, list, surveyRecordDTO);
+
+			}
+		}else{
+			AftersalesProcessorEntity processor1 = one.get();
+			//修改处理方 处理状态
+			updateProcessor(ProcessorProcessingStatusStatusConstant.yichuli.getValue(),processor1);
+			//修改回复信息
+			UpdateWrapper<AftersalesReplyingPartyEntity> updateWrapper = new UpdateWrapper<>();
+			updateWrapper.eq("work_order_id",aftersalesWorkOrderDTO.getId());
+			updateWrapper.eq("processor_id",processor1.getId());
+			updateWrapper.eq("difference","1");
+			updateWrapper.set("difference","2");
+			updateWrapper.set("processed_by_id",user.getUserId());
+			updateWrapper.set("processed_by_name",user.getUserName());
+			aftersalesReplyingPartyService.update(updateWrapper);
 
+			//添加或修改新的处理方
+			chuLiFang(aftersalesWorkOrderDTO, myCurrentWarehouse, user, list, surveyRecordDTO);
+
+		}
 		return true;
 	}
 
+	/**
+	 * 处理处理方数据
+	 * @param aftersalesWorkOrderDTO
+	 * @param myCurrentWarehouse
+	 * @param user
+	 * @param list
+	 * @param surveyRecordDTO
+	 */
+	private void chuLiFang(AftersalesWorkOrderDTO aftersalesWorkOrderDTO, BasicdataWarehouseEntity myCurrentWarehouse, BladeUser user, List<AftersalesProcessorEntity> list, AftersaleSurveyRecordDTO surveyRecordDTO) {
+		if(!aftersalesWorkOrderDTO.getProcessorEntityList().isEmpty()){
+			aftersalesWorkOrderDTO.getProcessorEntityList().forEach( i ->{
+				Optional<AftersalesProcessorEntity> first = list.stream().filter(a -> a.getBusinessId().equals(i.getBusinessId())).findFirst();
+
+				if(first.isPresent()){
+					//修改处理方 处理状态
+					updateProcessor(ProcessorProcessingStatusStatusConstant.daichuli.getValue(),first.get());
+				}else{
+					//不存在 添加处理方信息
+					AftersalesProcessorEntity processor = addProcessor(aftersalesWorkOrderDTO, myCurrentWarehouse, i);
+					processor.setConditions(ProcessorConditionsStatusConstant.xinzeng.getValue());
+					processor.setAssignTime(new Date());
+					//添加处理方
+					aftersalesProcessorService.save(processor);
+				}
+				//添加指定处理结果
+				//处理方
+				addSurveRecord(aftersalesWorkOrderDTO, user, i);
+				AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordDTO);
+				//添加待回复信息
+				aftersalesReplyingPartyService.save(replyingPartyEntity);
+			});
+
+		}else{
+			//没有 全部
+			List<AftersalesProcessorEntity> collect = list.stream().filter(i -> "1".equals(i.getProcessingStatus())).collect(Collectors.toList());
+			//添加待回复信息
+			collect.forEach( i ->{
+				//修改处理方 处理状态
+				updateProcessor(ProcessorProcessingStatusStatusConstant.daichuli.getValue(),i);
+				//添加指定处理结果
+				addSurveRecord(aftersalesWorkOrderDTO, user, i);
+				AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordDTO);
+				//添加待回复信息
+				aftersalesReplyingPartyService.save(replyingPartyEntity);
+			});
+		}
+
+
+	}
+
 	/**
 	 * 营业部提交异常工单处理结果
 	 * @param aftersalesWorkOrderDTO
@@ -1244,7 +1333,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		aftersaleSurveyRecordDTO.setFollowWarehouseId(myCurrentWarehouse.getId());
 		aftersaleSurveyRecordDTO.setFollowWarehouseName(myCurrentWarehouse.getName());
 		aftersaleSurveyRecordService.saveOrUpdateOwn(aftersaleSurveyRecordDTO);
-
+		//指派客服
+		addAssignCustomerService(aftersalesWorkOrderDTO,user);
 		return true;
 	}
 
@@ -1460,6 +1550,47 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		return R.status(true);
 	}
 
+	/**
+	 * 异常工单   自动指派职能客服
+	 *
+	 * @param aftersalesWorkOrderDTO
+	 */
+	@Async
+	@Override
+	public void addAssignCustomerService(AftersalesWorkOrderDTO aftersalesWorkOrderDTO, BladeUser user) {
+		List<AftersalesCustomerMallEntity> list = aftersalesCustomerMallService.list(Wrappers.<AftersalesCustomerMallEntity>query().lambda()
+			.eq(AftersalesCustomerMallEntity::getClientId, aftersalesWorkOrderDTO.getWaybillMallId())
+			.eq(AftersalesCustomerMallEntity::getConditions, "1")
+			.eq(AftersalesCustomerMallEntity::getTypesOf, "1")
+		);
+		if(list.isEmpty()){
+			log.info("没有客服信息！！！");
+		}
+		if(list.size() == 1){
+			AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
+			workOrderEntity.setId(aftersalesWorkOrderDTO.getId());
+			workOrderEntity.setCustomerServiceId(list.get(0).getCustomerServiceId());
+			workOrderEntity.setCustomerServiceName(list.get(0).getCustomerServiceName());
+			baseMapper.updateById(workOrderEntity);
+			log.info("异常工单》》》{}指派客服{}",aftersalesWorkOrderDTO.getId(),list.get(0).getCustomerServiceId());
+			//添加记录
+			AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = changName(aftersalesWorkOrderDTO, user);
+			aftersaleSurveyRecordDTO.setCreateUser(user.getUserId());
+			aftersaleSurveyRecordDTO.setCreateDept(Long.valueOf(user.getDeptId()));
+			aftersaleSurveyRecordDTO.setCreateTime(new Date());
+			aftersaleSurveyRecordDTO.setStatus(1);
+			aftersaleSurveyRecordDTO.setIsDeleted(0);
+			aftersaleSurveyRecordDTO.setTypesOf("1");
+			aftersaleSurveyRecordDTO.setProcessingResults("异常工单>"+aftersalesWorkOrderDTO.getWorkOrderNumber()+"自动指派了客服>"+list.get(0).getCustomerServiceName());
+			aftersaleSurveyRecordDTO.setDifference("3");
+			aftersaleSurveyRecordDTO.setWorkOrderId(aftersalesWorkOrderDTO.getId());
+//			aftersaleSurveyRecordDTO.setFollowWarehouseId(myCurrentWarehouse.getId());
+//			aftersaleSurveyRecordDTO.setFollowWarehouseName(myCurrentWarehouse.getName());
+			aftersaleSurveyRecordService.saveOrUpdateOwn(aftersaleSurveyRecordDTO);
+		}
+
+	}
+
 	/**
 	 * 添加处理处理方信息
 	 * @param aftersalesWorkOrderDTO

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesReplyingPartyWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *      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.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.logpm.aftersales.entity.AftersalesReplyingPartyEntity;
+import com.logpm.aftersales.vo.AftersalesReplyingPartyVO;
+import java.util.Objects;
+
+/**
+ * 异常工单沟通回复方 包装类,返回视图层所需的字段
+ *
+ * @author cyz
+ * @since 2023-12-26
+ */
+public class AftersalesReplyingPartyWrapper extends BaseEntityWrapper<AftersalesReplyingPartyEntity, AftersalesReplyingPartyVO>  {
+
+	public static AftersalesReplyingPartyWrapper build() {
+		return new AftersalesReplyingPartyWrapper();
+ 	}
+
+	@Override
+	public AftersalesReplyingPartyVO entityVO(AftersalesReplyingPartyEntity aftersalesReplyingParty) {
+		AftersalesReplyingPartyVO aftersalesReplyingPartyVO = Objects.requireNonNull(BeanUtil.copy(aftersalesReplyingParty, AftersalesReplyingPartyVO.class));
+
+		//User createUser = UserCache.getUser(aftersalesReplyingParty.getCreateUser());
+		//User updateUser = UserCache.getUser(aftersalesReplyingParty.getUpdateUser());
+		//aftersalesReplyingPartyVO.setCreateUserName(createUser.getName());
+		//aftersalesReplyingPartyVO.setUpdateUserName(updateUser.getName());
+
+		return aftersalesReplyingPartyVO;
+	}
+
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java

@@ -18,6 +18,7 @@ package com.logpm.basicdata.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
 import com.logpm.basicdata.service.IBasicdataStoreBusinessService;
 import lombok.AllArgsConstructor;
@@ -28,6 +29,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 /**
  * 门店业务记录 Feign实现类
  *
@@ -59,4 +62,13 @@ public class BasicdataStoreBusinessClient implements IBasicdataStoreBusinessClie
 		return basicdataStoreBusinessService.getOne(queryWrapper);
 	}
 
+	@Override
+	@GetMapping(GETCLIENTID)
+	public List<BasicdataStoreBusinessEntity> findByClientIdList(Long clientId) {
+	return 	basicdataStoreBusinessService.list(Wrappers.<BasicdataStoreBusinessEntity>query().lambda()
+			.eq(BasicdataStoreBusinessEntity::getClientId,clientId)
+		);
+	}
+
+
 }