1.工单模糊查询优化

2.超时数据导出

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

@@ -161,7 +161,7 @@ public class AftersalesOvertimeFineController extends BladeController {
 
 	/**
 	 * 导出数据
-	 * http://localhost:8798/aftersalesOvertimeFine/export-aftersalesOvertimeFine
+	 * http://localhost:8799/aftersalesOvertimeFine/export-aftersalesOvertimeFine
 	 */
 	@GetMapping("/export-aftersalesOvertimeFine")
 	@ApiOperationSupport(order = 9)

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

@@ -619,7 +619,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	}
 
 	/**
-	 * 客服异常工单 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
+	 * 客服异常工单 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人   //财务理赔入账日期、操作人  拆分
 	 */
 	@PostMapping("/updateWorkList")
 	@ApiOperationSupport(order = 5)

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

@@ -45,8 +45,8 @@ public class AftersalesOvertimeFineExcel implements Serializable {
 
 
 	@ColumnWidth(20)
-	@ExcelProperty("异常工单ID")
+	@ExcelProperty("异常工单号")
-	private String workOrderId;
+	private String workOrderNumber;
 
 	@ColumnWidth(20)
 	@ExcelProperty("金额")
@@ -56,8 +56,6 @@ public class AftersalesOvertimeFineExcel implements Serializable {
 	@ExcelProperty("超时时间")
 	private String timeout;
 
-	@ExcelIgnore
-	private String workOrderNumber;
 	@ColumnWidth(20)
 	@ExcelProperty("工单异常类型")
 	private String workOrderType;
@@ -80,4 +78,8 @@ public class AftersalesOvertimeFineExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("超时时间")
 	private Date createTime;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备注")
+	private String remarks;
 }

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

@@ -194,6 +194,12 @@ public class AftersalesWorkOrderExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("财务入账时间")
 	private Date entryTime;
+	/**
+	 * 操作人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("操作人")
+	private String operator;
 	/**
 	 * 备注
 	 */
@@ -227,11 +233,6 @@ public class AftersalesWorkOrderExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("钉钉流程号")
 	private String processNumber;
-	/**
+
-	 * 操作人
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("操作人")
-	private String operator;
 
 }

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

@@ -50,13 +50,14 @@
         SELECT
         laof.id,
         lawo.work_order_number workOrderNumber,
-        lawo.work_order_type workOrderType,
+        lawo.work_order_type ,
         lawo.discovery_node discoveryNode,
         COUNT( laof.id ) AS timeoutRecordNumber,
         laof.create_time createTime,
         laof.timeout,
         laof.money,
         laof.business_name businessName,
+        laof.remarks,
         lawo.id workOrderId
         FROM
         logpm_aftersales_overtime_fine laof

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

@@ -229,7 +229,14 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
         AND lacr.is_deleted = '0'
         <where>
         lawo.is_deleted = 0
-        <if test="param.id != null and param.id != '' ">and  lawo.id = #{param.id } </if>
+            <if test="param.ids != null and param.ids != ''">
+                and lawo.id IN
+                <bind name="idList" value="param.ids.split(',')"/>
+                <foreach collection="idList" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+
             <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
         <if test="param.initiationIdentification != null and param.initiationIdentification != '' ">and  lawo.initiation_identification = #{param.initiationIdentification } </if>
         <if test="param.discoveryNode != null and param.discoveryNode != '' ">and  lawo.discovery_node = #{param.discoveryNode } </if>
@@ -329,7 +336,8 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
         law.reviewed_by,
         law.audit_time,
         law.entry_time,
-        law.operator
+        law.operator,
+        law.brand_name
         FROM
         logpm_aftersales_processor lap
         LEFT JOIN logpm_aftersales_work_order law ON lap.work_order_id = law.id
@@ -360,6 +368,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.auditTime != null and param.auditTime != '' ">and  date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')  </if>
             <if test="param.entryTime != null and param.entryTime != '' ">and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') </if>
             <if test="param.overTime != null and param.overTime != '' ">and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') </if>
+            <if test="param.brandName != null and param.brandName != '' ">and  law.brand_name like concat('%',#{param.brandName},'%') </if>
         </where>
 
     </select>

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

@@ -116,7 +116,7 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	AftersalesWorkOrderVO getProcessingResults(AftersalesWorkOrderDTO aftersalesWorkOrder);
 
 	/**
-	 * 修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
+	 * 修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人         //财务理赔入账日期、操作人  拆分
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */

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

@@ -38,6 +38,7 @@ import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.logpm.aftersales.mapper.AftersalesWorkOrderMapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.distribution.entity.DistributionDeliveryListEntity;
 import com.logpm.distribution.feign.IDistributionDeliveryListClient;
 import com.logpm.distribution.vo.DistributionDeliveryListVO;
 import lombok.AllArgsConstructor;
@@ -118,14 +119,15 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 
 	@Override
-	public List<AftersalesWorkOrderExcel> exportAftersalesWorkOrder(Map<String, Object> objectMap) {
+	public List<AftersalesWorkOrderExcel> exportAftersalesWorkOrder(Map<String, Object> aftersalesWorkOrder) {
+		Object o = aftersalesWorkOrder.get("ids");
+
 
 		//查询用户角色信息
 		BladeUser user = AuthUtil.getUser();
 		String roleName = user.getRoleName();
 
 		String tenantId = user.getTenantId();
-
 		//查询客服岗位
 		List<DictBiz> warehouseType = DictBizCache.getList("after_sales_visits");
 		if (warehouseType.isEmpty()) {
@@ -137,7 +139,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				}
 				return false;
 			}).findFirst();
-			Object workOrderStatus = objectMap.get("workOrderStatus");
+			Object workOrderStatus = aftersalesWorkOrder.get("workOrderStatus");
 			if (first.isPresent()) {
 				//存在
 				String dictValue = first.get().getDictKey();
@@ -146,44 +148,55 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 					case "1": //客服经理 查询全部待处理工单
 						//待处理
 						if (ObjectUtils.isNotNull(workOrderStatus) && "500".equals(workOrderStatus)) {
-							objectMap.remove("workOrderStatus");
+							aftersalesWorkOrder.remove("workOrderStatus");
-							objectMap.put("customerServiceState","30");
+							aftersalesWorkOrder.put("customerServiceState", "30");
+						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.daichuli.getValue().equals(workOrderStatus)) {
+							aftersalesWorkOrder.remove("workOrderStatus");
+							aftersalesWorkOrder.put("customerServiceState", "20");
+							aftersalesWorkOrder.put("customerServiceState", "10");
+							aftersalesWorkOrder.put("customerServiceState", "40");
+							aftersalesWorkOrder.put("customerServiceState", "60");
+							aftersalesWorkOrder.put("customerServiceState", "100");
+							aftersalesWorkOrder.put("customerServiceState", "21");
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.yiwanjei.getValue().equals(workOrderStatus)) {
-							objectMap.remove("workOrderStatus");
+							aftersalesWorkOrder.remove("workOrderStatus");
-							objectMap.put("customerServiceState","10");
+							aftersalesWorkOrder.put("customerServiceState", "10");
+						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.daishenhe.getValue().equals(workOrderStatus)) {
+							aftersalesWorkOrder.remove("workOrderStatus");
+							aftersalesWorkOrder.put("customerServiceState", "40");
 						} else if (ObjectUtils.isNull(workOrderStatus)) {
-							objectMap.put("customerIdentification", "1");
+							aftersalesWorkOrder.put("customerIdentification", "1");
 						}
 						break;
 					case "2": // 营业部客服
 						BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 						if (ObjectUtils.isNotNull(myCurrentWarehouse)) {
-							objectMap.put("warehouseId", myCurrentWarehouse.getId());
+							aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId());
 						} else {
 							throw new ServiceException("请选择仓库！");
 						}
 						//已处理
 						if (ObjectUtils.isNotNull(workOrderStatus) && workOrderStatus.equals(WorkOrderStatusConstant.yichuli.getValue())) {
-							objectMap.remove("workOrderStatus");
+							aftersalesWorkOrder.remove("workOrderStatus");
-							objectMap.put("handleStatus","30");
+							aftersalesWorkOrder.put("handleStatus", "30");
 						}
 						//待处理
 						if (ObjectUtils.isNotNull(workOrderStatus) && workOrderStatus.equals(WorkOrderStatusConstant.daichuli.getValue())) {
-							objectMap.put("handleStatus","40");
+							aftersalesWorkOrder.put("handleStatus", "40");
 						}
 						//处理中
 						if (ObjectUtils.isNotNull(workOrderStatus) && workOrderStatus.equals(WorkOrderStatusConstant.chulizhong.getValue())) {
-							objectMap.put("handleStatus","50");
+							aftersalesWorkOrder.put("handleStatus", "50");
 						}
 						//已完结
 						if (ObjectUtils.isNotNull(workOrderStatus) && workOrderStatus.equals(WorkOrderStatusConstant.yiwanjei.getValue())) {
-							objectMap.remove("workOrderStatus");
+							aftersalesWorkOrder.remove("workOrderStatus");
-							objectMap.put("handleStatus","20");
+							aftersalesWorkOrder.put("handleStatus", "20");
 						}
 						//全部
 						if (ObjectUtils.isNotNull(workOrderStatus) && "1000".equals(workOrderStatus)) {
-							objectMap.remove("workOrderStatus");
+							aftersalesWorkOrder.remove("workOrderStatus");
-							objectMap.put("handleStatus","10");
+							aftersalesWorkOrder.put("handleStatus", "10");
 						}
 //						if( ObjectUtils.isNull(workOrderStatus)){
 //							aftersalesWorkOrder.put("handleStatus","10");
@@ -192,14 +205,18 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 						break;
 					case "3": //职能客服 查询自己的待处理工单
 						if (ObjectUtils.isNotNull(workOrderStatus) && "500".equals(workOrderStatus)) {
-							objectMap.remove("workOrderStatus");
+							aftersalesWorkOrder.remove("workOrderStatus");
-							objectMap.put("customerServiceState","20");
+							aftersalesWorkOrder.put("customerServiceState", "20");
-							objectMap.put("customerServiceId",user.getUserId());
+							aftersalesWorkOrder.put("customerServiceId", user.getUserId());
 						} else if (ObjectUtils.isNull(workOrderStatus)) {
-							objectMap.put("customerIdentification", "1");
+							aftersalesWorkOrder.put("customerIdentification", "1");
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.yiwanjei.getValue().equals(workOrderStatus)) {
-							objectMap.remove("workOrderStatus");
+							aftersalesWorkOrder.remove("workOrderStatus");
-							objectMap.put("customerServiceState","10");
+							aftersalesWorkOrder.put("customerServiceState", "10");
+						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.daichuli.getValue().equals(workOrderStatus)) {
+							aftersalesWorkOrder.remove("workOrderStatus");
+							aftersalesWorkOrder.put("customerServiceState", "30");
+							aftersalesWorkOrder.put("customerServiceId", user.getUserId());
 						}
 						break;
 				}
@@ -207,36 +224,36 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				//不存在
 				BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 				if (ObjectUtils.isNotNull(myCurrentWarehouse)) {
-					objectMap.put("warehouseId", myCurrentWarehouse.getId());
+					aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId());
 				} else {
 					throw new ServiceException("请选择仓库！");
 				}
 				//已处理
 				if (ObjectUtils.isNotNull(workOrderStatus) && workOrderStatus.equals(WorkOrderStatusConstant.yichuli.getValue())) {
-					objectMap.remove("workOrderStatus");
+					aftersalesWorkOrder.remove("workOrderStatus");
-					objectMap.put("handleStatus","30");
+					aftersalesWorkOrder.put("handleStatus", "30");
 				}
 				//待处理
 				if (ObjectUtils.isNotNull(workOrderStatus) && workOrderStatus.equals(WorkOrderStatusConstant.daichuli.getValue())) {
-					objectMap.put("handleStatus","40");
+					aftersalesWorkOrder.put("handleStatus", "40");
 				}
 				//处理中
 				if (ObjectUtils.isNotNull(workOrderStatus) && workOrderStatus.equals(WorkOrderStatusConstant.chulizhong.getValue())) {
-					objectMap.put("handleStatus","50");
+					aftersalesWorkOrder.put("handleStatus", "50");
 				}
 				//已完结
 				if (ObjectUtils.isNotNull(workOrderStatus) && workOrderStatus.equals(WorkOrderStatusConstant.yiwanjei.getValue())) {
-					objectMap.remove("workOrderStatus");
+					aftersalesWorkOrder.remove("workOrderStatus");
-					objectMap.put("handleStatus","20");
+					aftersalesWorkOrder.put("handleStatus", "20");
 				}
 				//全部
 				if (ObjectUtils.isNotNull(workOrderStatus) && "1000".equals(workOrderStatus)) {
-					objectMap.remove("workOrderStatus");
+					aftersalesWorkOrder.remove("workOrderStatus");
-					objectMap.put("handleStatus","10");
+					aftersalesWorkOrder.put("handleStatus", "10");
 				}
 			}
 		}
-		AftersalesWorkOrderEntity workOrderEntity = JSONObject.parseObject(JSONObject.toJSONString(objectMap), AftersalesWorkOrderEntity.class);
+		AftersalesWorkOrderVO workOrderEntity = JSONObject.parseObject(JSONObject.toJSONString(aftersalesWorkOrder), AftersalesWorkOrderVO.class);
 		List<AftersalesWorkOrderExcel> aftersalesWorkOrderList = new ArrayList<>();
 		//导出
 		List<AftersalesWorkOrderVO> aftersalesWorkOrderEntities = baseMapper.exportAftersalesWorkOrder(workOrderEntity);
@@ -247,6 +264,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			BeanUtil.copyProperties(i, aftersalesWorkOrderExcel);
 			aftersalesWorkOrderList.add(aftersalesWorkOrderExcel);
 			aftersalesWorkOrderExcel.setWorkOrderTypeName(DictBizCache.getValue(DictBizConstant.PC_WORK_ORDER, i.getWorkOrderStatus()));
+			aftersalesWorkOrderExcel.setWorkOrderStatus(DictBizCache.getValue(DictBizConstant.WORK_ORDER_STATUS, i.getWorkOrderStatus()));
 			if ("PC".equals(aftersalesWorkOrderExcel.getInitiationIdentification())) {
 				//PC
 				aftersalesWorkOrderExcel.setDiscoveryNodeName(DictBizCache.getValue(DictBizConstant.PC_DISCOVERY_NODE, i.getDiscoveryNode()));
@@ -262,6 +280,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 生成异常工单号
+	 *
 	 * @return
 	 */
 	public String getWorkOrderNumber(String name, String workOrderType) {
@@ -291,11 +310,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	}
 
 
-
-
-
 	/**
 	 * 添加或修改
+	 *
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */
@@ -523,6 +540,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 回复信息添加
+	 *
 	 * @param aftersalesWorkOrder
 	 * @param processor
 	 * @param aftersaleSurveyRecord
@@ -544,6 +562,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 查询调查记录的部分信息
+	 *
 	 * @param aftersalesWorkOrder
 	 * @param user
 	 * @return
@@ -587,6 +606,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 查询待处理的异常工单数据
+	 *
 	 * @param aftersalesWorkOrder
 	 * @param page
 	 * @return
@@ -600,6 +620,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 完成异常工单数据
+	 *
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */
@@ -700,8 +721,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 							aftersalesWorkOrder.put("customerServiceState", "60");
 							aftersalesWorkOrder.put("customerServiceState", "100");
 							aftersalesWorkOrder.put("customerServiceState", "21");
-						}
+						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.yiwanjei.getValue().equals(workOrderStatus)) {
-						else if(ObjectUtils.isNotNull( workOrderStatus ) && WorkOrderStatusConstant.yiwanjei.getValue().equals(workOrderStatus)) {
 							aftersalesWorkOrder.remove("workOrderStatus");
 							aftersalesWorkOrder.put("customerServiceState", "10");
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.daishenhe.getValue().equals(workOrderStatus)) {
@@ -1049,6 +1069,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 指派客服处理工单
+	 *
 	 * @param aftersalesWorkOrderDTO
 	 * @return
 	 */
@@ -1084,6 +1105,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 客服异常工单 查询处理结果信息数据
+	 *
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */
@@ -1171,7 +1193,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	}
 
 	/**
-	 * 修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
+	 * 修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人   //财务理赔入账日期、操作人  拆分
+	 *
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */
@@ -1200,6 +1223,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 导入 批量修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
+	 *
 	 * @param data
 	 * @param isCovered
 	 */
@@ -1276,6 +1300,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 查询客服信息
+	 *
 	 * @return
 	 */
 	@Override
@@ -1318,6 +1343,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 申请仲裁
+	 *
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */
@@ -1411,6 +1437,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 查询  营业部责任人人员信息
+	 *
 	 * @return
 	 */
 	@Override
@@ -1432,6 +1459,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 添加调查记录
+	 *
 	 * @param aftersalesWorkOrderDTO
 	 * @return
 	 */
@@ -1544,6 +1572,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 处理处理方数据
+	 *
 	 * @param aftersalesWorkOrderDTO
 	 * @param myCurrentWarehouse
 	 * @param user
@@ -1610,6 +1639,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 营业部提交异常工单处理结果   112233
+	 *
 	 * @param aftersalesWorkOrderDTO
 	 * @return
 	 */
@@ -1706,7 +1736,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		}
 
 
-
 		//添加操作记录
 //		AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = new AftersaleSurveyRecordDTO();
 		AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = changName(aftersalesWorkOrderDTO, user);
@@ -1730,6 +1759,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 查询调查数据
+	 *
 	 * @param aftersalesWorkOrderDTO
 	 * @return
 	 */
@@ -1799,6 +1829,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 查询全部跟踪记录
+	 *
 	 * @param aftersalesWorkOrderDTO
 	 * @return
 	 */
@@ -1815,6 +1846,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 查询理赔集合
+	 *
 	 * @param aftersalesWorkOrder
 	 * @param page
 	 * @return
@@ -1834,6 +1866,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 添加工单跟踪记录
+	 *
 	 * @param workOrderId
 	 * @param results
 	 * @param difference
@@ -1862,6 +1895,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 修改完结数据
+	 *
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */
@@ -1973,6 +2007,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 客服异常工单 异常工单仲裁  分配处理客服信息
+	 *
 	 * @param aftersalesWorkOrderDTO
 	 * @return
 	 */
@@ -2045,6 +2080,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 批量修改工单状态为已处理
+	 *
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */
@@ -2079,6 +2115,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 客服异常工单 客服经理确定数据
+	 *
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */
@@ -2097,6 +2134,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 修改申述状态数据
+	 *
 	 * @param aftersalesAppeal
 	 * @return
 	 */
@@ -2119,6 +2157,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 修改结束仲裁
+	 *
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */
@@ -2134,6 +2173,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 添加处理处理方信息
+	 *
 	 * @param aftersalesWorkOrderDTO
 	 * @param myCurrentWarehouse
 	 * @param i
@@ -2150,6 +2190,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 添加操作记录
+	 *
 	 * @param aftersalesWorkOrderDTO
 	 * @param user
 	 * @param i
@@ -2180,6 +2221,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	/**
 	 * 修改处理方状态
+	 *
 	 * @param type
 	 * @return
 	 */