添加调查经过，责任人比例

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

@@ -0,0 +1,95 @@
+/*
+ *      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 java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 工单调查记录表 实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@TableName("logpm_aftersale_survey_record")
+@ApiModel(value = "AftersaleSurveyRecord对象", description = "工单调查记录表")
+@EqualsAndHashCode(callSuper = true)
+public class AftersaleSurveyRecordEntity 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;
+	/**
+	 * 添加人名称
+	 */
+	@ApiModelProperty(value = "添加人名称")
+	private String addPeople;
+	/**
+	 * 添加部门名称
+	 */
+	@ApiModelProperty(value = "添加部门名称")
+	private String addDepartment;
+	/**
+	 * 内容
+	 */
+	@ApiModelProperty(value = "内容")
+	private String content;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ApiModelProperty(value = "区别")
+	private String difference;
+	/**
+	 * 工单ID
+	 */
+	@ApiModelProperty(value = "工单ID")
+	private String workOrderId;
+
+}

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

@@ -0,0 +1,105 @@
+/*
+ *      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 java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常工单预计责任人 实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@TableName("logpm_aftersales_person_responsible")
+@ApiModel(value = "AftersalesPersonResponsible对象", description = "异常工单预计责任人")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesPersonResponsibleEntity 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 String wordOrderId;
+	/**
+	 * 责任人ID
+	 */
+	@ApiModelProperty(value = "责任人ID")
+	private String personResponsibleId;
+	/**
+	 * 责任人名称
+	 */
+	@ApiModelProperty(value = "责任人名称")
+	private String personResponsibleName;
+	/**
+	 * 责任比例
+	 */
+	@ApiModelProperty(value = "责任比例")
+	private String responsibilityRatio;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ApiModelProperty(value = "区别")
+	private String difference;
+	/**
+	 * 责任方名称
+	 */
+	@ApiModelProperty(value = "责任方名称")
+	private String businessName;
+	/**
+	 * 责任方ID
+	 */
+	@ApiModelProperty(value = "责任方ID")
+	private Long businessId;
+
+}

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.aftersales.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -234,10 +235,21 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "操作人")
 	private String operator;
+	/**
+	 * 公司比例
+	 */
+	@ApiModelProperty(value = "公司比例")
+	private String companyProportion;
 	/**
 	 * 关联工单ID
 	 */
 	@ApiModelProperty(value = "关联工单ID")
 	private Long relatedWorkOrdersId;
+	/**
+	 * 客服经理标识
+	 */
+	@ApiModelProperty(value = "客服经理标识")
+	@TableField(exist = false)
+	private String  customerIdentification;
 
 }

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersaleSurveyRecordClient.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.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+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-09
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersaleSurveyRecordClient {
+
+    String API_PREFIX = "/surveyRecord/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取工单调查记录表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersaleSurveyRecordEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesPersonResponsibleClient.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.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+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-09
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesPersonResponsibleClient {
+
+    String API_PREFIX = "/personResponsible/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取异常工单预计责任人列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesPersonResponsibleEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersaleSurveyRecordVO.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.AftersaleSurveyRecordEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工单调查记录表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersaleSurveyRecordVO extends AftersaleSurveyRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesPersonResponsibleVO.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.AftersalesPersonResponsibleEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单预计责任人 视图实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesPersonResponsibleVO extends AftersalesPersonResponsibleEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersaleSurveyRecordController.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.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.logpm.aftersales.wrapper.AftersaleSurveyRecordWrapper;
+import com.logpm.aftersales.service.IAftersaleSurveyRecordService;
+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-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-aftersaleSurveyRecord/aftersaleSurveyRecord")
+@Api(value = "工单调查记录表", tags = "工单调查记录表接口")
+public class AftersaleSurveyRecordController extends BladeController {
+
+	private final IAftersaleSurveyRecordService aftersaleSurveyRecordService;
+
+	/**
+	 * 工单调查记录表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersaleSurveyRecord")
+	public R<AftersaleSurveyRecordVO> detail(AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		AftersaleSurveyRecordEntity detail = aftersaleSurveyRecordService.getOne(Condition.getQueryWrapper(aftersaleSurveyRecord));
+		return R.data(AftersaleSurveyRecordWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 工单调查记录表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersaleSurveyRecord")
+	public R<IPage<AftersaleSurveyRecordVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersaleSurveyRecord, Query query) {
+		IPage<AftersaleSurveyRecordEntity> pages = aftersaleSurveyRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersaleSurveyRecord, AftersaleSurveyRecordEntity.class));
+		return R.data(AftersaleSurveyRecordWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 工单调查记录表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersaleSurveyRecord")
+	public R<IPage<AftersaleSurveyRecordVO>> page(AftersaleSurveyRecordVO aftersaleSurveyRecord, Query query) {
+		IPage<AftersaleSurveyRecordVO> pages = aftersaleSurveyRecordService.selectAftersaleSurveyRecordPage(Condition.getPage(query), aftersaleSurveyRecord);
+		return R.data(pages);
+	}
+
+	/**
+	 * 工单调查记录表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersaleSurveyRecord")
+	public R save(@Valid @RequestBody AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		return R.status(aftersaleSurveyRecordService.save(aftersaleSurveyRecord));
+	}
+
+	/**
+	 * 工单调查记录表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersaleSurveyRecord")
+	public R update(@Valid @RequestBody AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		return R.status(aftersaleSurveyRecordService.updateById(aftersaleSurveyRecord));
+	}
+
+	/**
+	 * 工单调查记录表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersaleSurveyRecord")
+	public R submit(@Valid @RequestBody AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		return R.status(aftersaleSurveyRecordService.saveOrUpdate(aftersaleSurveyRecord));
+	}
+
+	/**
+	 * 工单调查记录表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersaleSurveyRecordService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersaleSurveyRecord")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersaleSurveyRecord")
+	public void exportAftersaleSurveyRecord(@ApiIgnore @RequestParam Map<String, Object> aftersaleSurveyRecord, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersaleSurveyRecordEntity> queryWrapper = Condition.getQueryWrapper(aftersaleSurveyRecord, AftersaleSurveyRecordEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersaleSurveyRecord::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersaleSurveyRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersaleSurveyRecordExcel> list = aftersaleSurveyRecordService.exportAftersaleSurveyRecord(queryWrapper);
+		ExcelUtil.export(response, "工单调查记录表数据" + DateUtil.time(), "工单调查记录表数据表", list, AftersaleSurveyRecordExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesPersonResponsibleController.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.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.logpm.aftersales.wrapper.AftersalesPersonResponsibleWrapper;
+import com.logpm.aftersales.service.IAftersalesPersonResponsibleService;
+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-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-aftersalesPersonResponsible/aftersalesPersonResponsible")
+@Api(value = "异常工单预计责任人", tags = "异常工单预计责任人接口")
+public class AftersalesPersonResponsibleController extends BladeController {
+
+	private final IAftersalesPersonResponsibleService aftersalesPersonResponsibleService;
+
+	/**
+	 * 异常工单预计责任人 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesPersonResponsible")
+	public R<AftersalesPersonResponsibleVO> detail(AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		AftersalesPersonResponsibleEntity detail = aftersalesPersonResponsibleService.getOne(Condition.getQueryWrapper(aftersalesPersonResponsible));
+		return R.data(AftersalesPersonResponsibleWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常工单预计责任人 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesPersonResponsible")
+	public R<IPage<AftersalesPersonResponsibleVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesPersonResponsible, Query query) {
+		IPage<AftersalesPersonResponsibleEntity> pages = aftersalesPersonResponsibleService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesPersonResponsible, AftersalesPersonResponsibleEntity.class));
+		return R.data(AftersalesPersonResponsibleWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常工单预计责任人 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesPersonResponsible")
+	public R<IPage<AftersalesPersonResponsibleVO>> page(AftersalesPersonResponsibleVO aftersalesPersonResponsible, Query query) {
+		IPage<AftersalesPersonResponsibleVO> pages = aftersalesPersonResponsibleService.selectAftersalesPersonResponsiblePage(Condition.getPage(query), aftersalesPersonResponsible);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常工单预计责任人 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesPersonResponsible")
+	public R save(@Valid @RequestBody AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		return R.status(aftersalesPersonResponsibleService.save(aftersalesPersonResponsible));
+	}
+
+	/**
+	 * 异常工单预计责任人 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesPersonResponsible")
+	public R update(@Valid @RequestBody AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		return R.status(aftersalesPersonResponsibleService.updateById(aftersalesPersonResponsible));
+	}
+
+	/**
+	 * 异常工单预计责任人 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesPersonResponsible")
+	public R submit(@Valid @RequestBody AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		return R.status(aftersalesPersonResponsibleService.saveOrUpdate(aftersalesPersonResponsible));
+	}
+
+	/**
+	 * 异常工单预计责任人 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesPersonResponsibleService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesPersonResponsible")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesPersonResponsible")
+	public void exportAftersalesPersonResponsible(@ApiIgnore @RequestParam Map<String, Object> aftersalesPersonResponsible, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesPersonResponsibleEntity> queryWrapper = Condition.getQueryWrapper(aftersalesPersonResponsible, AftersalesPersonResponsibleEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesPersonResponsible::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesPersonResponsibleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesPersonResponsibleExcel> list = aftersalesPersonResponsibleService.exportAftersalesPersonResponsible(queryWrapper);
+		ExcelUtil.export(response, "异常工单预计责任人数据" + DateUtil.time(), "异常工单预计责任人数据表", list, AftersalesPersonResponsibleExcel.class);
+	}
+
+}

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

@@ -269,6 +269,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入aftersalesWorkOrder")
 	public R submit(@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrder) {
 		log.info("工单创建的数据{}",aftersalesWorkOrder.toString());
+		aftersalesWorkOrder.setInitiationIdentification("PC");
 		return R.status(aftersalesWorkOrderService.saveOrUpdateOwn(aftersalesWorkOrder));
 	}
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersaleSurveyRecordDTO.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.AftersaleSurveyRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工单调查记录表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersaleSurveyRecordDTO extends AftersaleSurveyRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesPersonResponsibleDTO.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.AftersalesPersonResponsibleEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单预计责任人 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesPersonResponsibleDTO extends AftersalesPersonResponsibleEntity {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -77,7 +77,19 @@ public class AftersalesWorkOrderDTO extends AftersalesWorkOrderEntity {
 	 */
 	private AftersalesProcessingResultsDTO aftersalesProcessingResultsDTO;
 
-
+	/**
+	 * 添加预计责任人
+	 */
+	private List<AftersalesPersonResponsibleDTO> personResponsibleDTO;
+	/**
+	 * 取消预计责任人
+	 */
+	private List<AftersalesPersonResponsibleDTO> unPersonResponsibleDTO;
+	/**
+	 *
+	 * 调查经过
+	 */
+	private AftersaleSurveyRecordDTO surveyRecordDTO;
 
 
 }

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

@@ -0,0 +1,123 @@
+/*
+ *      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 java.util.Date;
+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-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersaleSurveyRecordExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 添加人名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("添加人名称")
+	private String addPeople;
+	/**
+	 * 添加部门名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("添加部门名称")
+	private String addDepartment;
+	/**
+	 * 内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内容")
+	private String content;
+	/**
+	 * 类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("区别")
+	private String difference;
+	/**
+	 * 工单ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单ID")
+	private String workOrderId;
+
+}

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

@@ -0,0 +1,123 @@
+/*
+ *      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 java.util.Date;
+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-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersalesPersonResponsibleExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 工单异常ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单异常ID")
+	private String wordOrderId;
+	/**
+	 * 责任人ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任人ID")
+	private String personResponsibleId;
+	/**
+	 * 责任人名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任人名称")
+	private String personResponsibleName;
+	/**
+	 * 责任比例
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任比例")
+	private String responsibilityRatio;
+	/**
+	 * 类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("区别")
+	private String difference;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersaleSurveyRecordClient.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.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.service.IAftersaleSurveyRecordService;
+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-09
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class AftersaleSurveyRecordClient implements IAftersaleSurveyRecordClient {
+
+    private final IAftersaleSurveyRecordService aftersaleSurveyRecordService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<AftersaleSurveyRecordEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<AftersaleSurveyRecordEntity> page = aftersaleSurveyRecordService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesPersonResponsibleClient.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.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.service.IAftersalesPersonResponsibleService;
+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-09
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class AftersalesPersonResponsibleClient implements IAftersalesPersonResponsibleClient {
+
+    private final IAftersalesPersonResponsibleService aftersalesPersonResponsibleService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<AftersalesPersonResponsibleEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<AftersalesPersonResponsibleEntity> page = aftersalesPersonResponsibleService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersaleSurveyRecordMapper.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.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+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-09
+ */
+public interface AftersaleSurveyRecordMapper extends BaseMapper<AftersaleSurveyRecordEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	List<AftersaleSurveyRecordVO> selectAftersaleSurveyRecordPage(IPage page, AftersaleSurveyRecordVO aftersaleSurveyRecord);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersaleSurveyRecordExcel> exportAftersaleSurveyRecord(@Param("ew") Wrapper<AftersaleSurveyRecordEntity> queryWrapper);
+
+}

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

@@ -0,0 +1,39 @@
+<?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.AftersaleSurveyRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="aftersaleSurveyRecordResultMap" type="com.logpm.aftersales.entity.AftersaleSurveyRecordEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="add_people" property="addPeople"/>
+        <result column="add_department" property="addDepartment"/>
+        <result column="content" property="content"/>
+        <result column="types_of" property="typesOf"/>
+        <result column="difference" property="difference"/>
+        <result column="work_order_id" property="workOrderId"/>
+    </resultMap>
+
+
+    <select id="selectAftersaleSurveyRecordPage" resultMap="aftersaleSurveyRecordResultMap">
+        select * from logpm_aftersale_survey_record where is_deleted = 0
+    </select>
+
+
+    <select id="exportAftersaleSurveyRecord" resultType="com.logpm.aftersales.excel.AftersaleSurveyRecordExcel">
+        SELECT * FROM logpm_aftersale_survey_record ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesPersonResponsibleMapper.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.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+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-09
+ */
+public interface AftersalesPersonResponsibleMapper extends BaseMapper<AftersalesPersonResponsibleEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersalesPersonResponsible
+	 * @return
+	 */
+	List<AftersalesPersonResponsibleVO> selectAftersalesPersonResponsiblePage(IPage page, AftersalesPersonResponsibleVO aftersalesPersonResponsible);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersalesPersonResponsibleExcel> exportAftersalesPersonResponsible(@Param("ew") Wrapper<AftersalesPersonResponsibleEntity> queryWrapper);
+
+}

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

@@ -0,0 +1,39 @@
+<?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.AftersalesPersonResponsibleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="aftersalesPersonResponsibleResultMap" type="com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="word_order_id" property="wordOrderId"/>
+        <result column="person_responsible_id" property="personResponsibleId"/>
+        <result column="person_responsible_name" property="personResponsibleName"/>
+        <result column="responsibility_ratio" property="responsibilityRatio"/>
+        <result column="types_of" property="typesOf"/>
+        <result column="difference" property="difference"/>
+    </resultMap>
+
+
+    <select id="selectAftersalesPersonResponsiblePage" resultMap="aftersalesPersonResponsibleResultMap">
+        select * from logpm_aftersales_person_responsible where is_deleted = 0
+    </select>
+
+
+    <select id="exportAftersalesPersonResponsible" resultType="com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel">
+        SELECT * FROM logpm_aftersales_person_responsible ${ew.customSqlSegment}
+    </select>
+
+</mapper>

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

@@ -51,7 +51,7 @@
     </resultMap>
     <!--查询完整的异常工单信息-->
     <select id="pageListOwn" resultType="com.logpm.aftersales.entity.AftersalesWorkOrderEntity">
-        select lawo.work_order_type,lawo.discovery_node,lawo.work_order_number,lawo.waybill_number,lawo.order_code,lawo.train_number,lawo.first,
+        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,
                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
         from logpm_aftersales_work_order lawo
@@ -77,16 +77,14 @@ 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.waybillMall != null and param.waybillMall != '' ">and  lawo.waybill_mall = #{param.waybillMall } </if>
             <if test="param.deliveryDriver != null and param.deliveryDriver != '' ">and  lawo.delivery_driver = #{param.deliveryDriver } </if>
             <if test="param.workOrderStatus != null and param.workOrderStatus != '' ">and  lawo.work_order_status = #{param.workOrderStatus } </if>
             <if test="param.customerServiceId != null and param.customerServiceId != '' ">and  lawo.customer_service_id = #{param.customerServiceId } </if>
             <if test="param.customerServiceName != null and param.customerServiceName != '' ">and  lawo.customer_service_name = #{param.customerServiceName } </if>
             <if test="param.waybillMallId != null and param.waybillMallId != '' ">and  lawo.waybill_mall_id = #{param.waybillMallId } </if>
-            <if test="param.problemDescription != null and param.problemDescription != '' ">and  lawo.problem_description = #{param.problemDescription } </if>
-            <if test="param.warehouseId != null and param.warehouseId != '' ">and  lawo.warehouse_id = #{param.warehouseId } </if>
+            <if test="param.problemDescription != null and param.problemDescription != '' ">and  lawo.problem_description = #{param.problemDescription} </if>
+            <if test="param.warehouseId != null and param.warehouseId != '' ">and  lawo.warehouse_id = #{param.warehouseId} </if>
             <if test="param.personResponsible != null and param.personResponsible != '' ">and  lawo.person_responsible = #{param.personResponsible } </if>
             <if test="param.processNumber != null and param.processNumber != '' ">and  lawo.process_number = #{param.processNumber } </if>
             <if test="param.reviewedBy != null and param.reviewedBy != '' ">and  lawo.reviewed_by = #{param.reviewedBy } </if>
@@ -95,6 +93,9 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.processedBy != null and param.processedBy != '' ">and  lawo.processed_by = #{param.processedBy} </if>
             <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')
+            </if>
         </where>
 
     </select>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersaleSurveyRecordService.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.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 工单调查记录表 服务类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public interface IAftersaleSurveyRecordService extends BaseService<AftersaleSurveyRecordEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	IPage<AftersaleSurveyRecordVO> selectAftersaleSurveyRecordPage(IPage<AftersaleSurveyRecordVO> page, AftersaleSurveyRecordVO aftersaleSurveyRecord);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersaleSurveyRecordExcel> exportAftersaleSurveyRecord(Wrapper<AftersaleSurveyRecordEntity> queryWrapper);
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesPersonResponsibleService.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.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 异常工单预计责任人 服务类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public interface IAftersalesPersonResponsibleService extends BaseService<AftersalesPersonResponsibleEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersalesPersonResponsible
+	 * @return
+	 */
+	IPage<AftersalesPersonResponsibleVO> selectAftersalesPersonResponsiblePage(IPage<AftersalesPersonResponsibleVO> page, AftersalesPersonResponsibleVO aftersalesPersonResponsible);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersalesPersonResponsibleExcel> exportAftersalesPersonResponsible(Wrapper<AftersalesPersonResponsibleEntity> queryWrapper);
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersaleSurveyRecordServiceImpl.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.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.logpm.aftersales.mapper.AftersaleSurveyRecordMapper;
+import com.logpm.aftersales.service.IAftersaleSurveyRecordService;
+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-09
+ */
+@Service
+public class AftersaleSurveyRecordServiceImpl extends BaseServiceImpl<AftersaleSurveyRecordMapper, AftersaleSurveyRecordEntity> implements IAftersaleSurveyRecordService {
+
+	@Override
+	public IPage<AftersaleSurveyRecordVO> selectAftersaleSurveyRecordPage(IPage<AftersaleSurveyRecordVO> page, AftersaleSurveyRecordVO aftersaleSurveyRecord) {
+		return page.setRecords(baseMapper.selectAftersaleSurveyRecordPage(page, aftersaleSurveyRecord));
+	}
+
+
+	@Override
+	public List<AftersaleSurveyRecordExcel> exportAftersaleSurveyRecord(Wrapper<AftersaleSurveyRecordEntity> queryWrapper) {
+		List<AftersaleSurveyRecordExcel> aftersaleSurveyRecordList = baseMapper.exportAftersaleSurveyRecord(queryWrapper);
+		//aftersaleSurveyRecordList.forEach(aftersaleSurveyRecord -> {
+		//	aftersaleSurveyRecord.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersaleSurveyRecord.getType()));
+		//});
+		return aftersaleSurveyRecordList;
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesPersonResponsibleServiceImpl.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.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.logpm.aftersales.mapper.AftersalesPersonResponsibleMapper;
+import com.logpm.aftersales.service.IAftersalesPersonResponsibleService;
+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-09
+ */
+@Service
+public class AftersalesPersonResponsibleServiceImpl extends BaseServiceImpl<AftersalesPersonResponsibleMapper, AftersalesPersonResponsibleEntity> implements IAftersalesPersonResponsibleService {
+
+	@Override
+	public IPage<AftersalesPersonResponsibleVO> selectAftersalesPersonResponsiblePage(IPage<AftersalesPersonResponsibleVO> page, AftersalesPersonResponsibleVO aftersalesPersonResponsible) {
+		return page.setRecords(baseMapper.selectAftersalesPersonResponsiblePage(page, aftersalesPersonResponsible));
+	}
+
+
+	@Override
+	public List<AftersalesPersonResponsibleExcel> exportAftersalesPersonResponsible(Wrapper<AftersalesPersonResponsibleEntity> queryWrapper) {
+		List<AftersalesPersonResponsibleExcel> aftersalesPersonResponsibleList = baseMapper.exportAftersalesPersonResponsible(queryWrapper);
+		//aftersalesPersonResponsibleList.forEach(aftersalesPersonResponsible -> {
+		//	aftersalesPersonResponsible.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesPersonResponsible.getType()));
+		//});
+		return aftersalesPersonResponsibleList;
+	}
+
+}

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

@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.aftersales.dto.AftersaleSurveyRecordDTO;
+import com.logpm.aftersales.dto.AftersalesPersonResponsibleDTO;
 import com.logpm.aftersales.dto.AftersalesProcessingResultsDTO;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 import com.logpm.aftersales.entity.*;
@@ -33,6 +35,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
 import org.springblade.common.constant.aftersales.WorkOrderTypesOfStatusConstant;
@@ -81,6 +84,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	private final IAftersalesProcessingResultsService aftersalesProcessingResultsService;
 	private final IAftersalesOvertimeFineService aftersalesOvertimeFineService;
 	private final IAftersalesArbitrationOrderService aftersalesArbitrationOrderService;
+	private final IAftersaleSurveyRecordService aftersaleSurveyRecordService;
+	private final IAftersalesPersonResponsibleService aftersalesPersonResponsibleService;
 
 	private final IBasicdataWarehouseClient warehouseClient;
 
@@ -182,7 +187,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			}
 			baseMapper.insert(aftersalesWorkOrder);
 
-
 		}else{
 			//修改
 			if(ObjectUtil.isNotNull(aftersalesWorkOrder.getUnPpackageEntityList())){
@@ -272,10 +276,54 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			}
 
 		}
+		//添加调查记录
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getSurveyRecordDTO())){
+			AftersaleSurveyRecordDTO surveyRecordDTO = aftersalesWorkOrder.getSurveyRecordDTO();
+			surveyRecordDTO.setAddPeople(user.getUserName());
+			R<List<String>> deptNames = sysClient.getDeptNames(user.getDeptId());
+			if(ObjectUtils.isNotNull(deptNames)){
+				String collect = deptNames.getData().stream().collect(Collectors.joining(","));
+				surveyRecordDTO.setAddDepartment(collect);
+			}
+			AftersaleSurveyRecordEntity aftersaleSurveyRecord = new AftersaleSurveyRecordEntity();
+			BeanUtil.copyProperties(surveyRecordDTO,aftersaleSurveyRecord);
+			aftersaleSurveyRecord.setTypesOf("1");
+			aftersaleSurveyRecord.setDifference("1");
+			aftersaleSurveyRecordService.save(aftersaleSurveyRecord);
+		}
+		//添加责任人信息
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getPersonResponsibleDTO()) && !aftersalesWorkOrder.getPersonResponsibleDTO().isEmpty()){
+			List<AftersalesPersonResponsibleEntity> personResponsibleList = getAftersalesPersonResponsibleEntities(aftersalesWorkOrder);
+			if(!personResponsibleList.isEmpty()){
+				aftersalesPersonResponsibleService.saveBatch(personResponsibleList);
+			}
+		}
+		//添加完结受款方数据
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getCompletionRecipientEntities())){
+			completionRecordService.saveBatch(aftersalesWorkOrder.getCompletionRecordEntities());
+		}
+		//添加完结赔款方数据
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getCompletionRecordEntities())){
+			completionRecordService.saveBatch(aftersalesWorkOrder.getCompletionRecordEntities());
+		}
+			return  true;
+	}
 
 
+	//添加责任人信息
+	@NotNull
+	private static List<AftersalesPersonResponsibleEntity> getAftersalesPersonResponsibleEntities(AftersalesWorkOrderDTO aftersalesWorkOrder) {
+		List<AftersalesPersonResponsibleDTO> personResponsibleDTO = aftersalesWorkOrder.getPersonResponsibleDTO();
+		List<AftersalesPersonResponsibleEntity> personResponsibleList = new ArrayList<>();
 
-			return  true;
+		personResponsibleDTO.forEach( i ->{
+			AftersalesPersonResponsibleEntity personResponsibleEntity = new AftersalesPersonResponsibleEntity();
+			BeanUtil.copyProperties(i , personResponsibleEntity);
+			personResponsibleEntity.setDifference("1");
+			personResponsibleEntity.setTypesOf("1");
+			personResponsibleList.add(personResponsibleEntity);
+		});
+		return personResponsibleList;
 	}
 
 	/**
@@ -335,23 +383,23 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			throw new ServiceException("注意，注意！售后访问字典未配置！请配置！");
 		} else {
 			Optional<DictBiz> first = warehouseType.stream().filter(i -> {
-				if (i.getDictKey().equals(roleName)) {
+				if (i.getDictValue().equals(roleName)) {
 					return true;
 				}
 				return false;
 			}).findFirst();
 			if(first.isPresent()){
 				//存在
-				DictBiz dictBiz = first.get();
-				String dictValue = dictBiz.getDictValue();
+				String dictValue = first.get().getDictKey();
+
 				switch (dictValue){
 					case "1": //客服经理 查询全部待处理工单
-
+						aftersalesWorkOrder.put("customerIdentification", "1");
 						break;
 					case "2": // 营业部客服
 						BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 						if(ObjectUtils.isNotNull(myCurrentWarehouse)){
-							aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId());
+							aftersalesWorkOrder.put("businessId", myCurrentWarehouse.getId());
 						}else{
 							throw new ServiceException("请选择仓库！");
 						}
@@ -365,7 +413,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				//不存在
 				BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 				if(ObjectUtils.isNotNull(myCurrentWarehouse)){
-					aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId());
+					aftersalesWorkOrder.put("businessId", myCurrentWarehouse.getId());
 				}else{
 					throw new ServiceException("请选择仓库！");
 				}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersaleSurveyRecordWrapper.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.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import java.util.Objects;
+
+/**
+ * 工单调查记录表 包装类,返回视图层所需的字段
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public class AftersaleSurveyRecordWrapper extends BaseEntityWrapper<AftersaleSurveyRecordEntity, AftersaleSurveyRecordVO>  {
+
+	public static AftersaleSurveyRecordWrapper build() {
+		return new AftersaleSurveyRecordWrapper();
+ 	}
+
+	@Override
+	public AftersaleSurveyRecordVO entityVO(AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		AftersaleSurveyRecordVO aftersaleSurveyRecordVO = Objects.requireNonNull(BeanUtil.copy(aftersaleSurveyRecord, AftersaleSurveyRecordVO.class));
+
+		//User createUser = UserCache.getUser(aftersaleSurveyRecord.getCreateUser());
+		//User updateUser = UserCache.getUser(aftersaleSurveyRecord.getUpdateUser());
+		//aftersaleSurveyRecordVO.setCreateUserName(createUser.getName());
+		//aftersaleSurveyRecordVO.setUpdateUserName(updateUser.getName());
+
+		return aftersaleSurveyRecordVO;
+	}
+
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesPersonResponsibleWrapper.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.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import java.util.Objects;
+
+/**
+ * 异常工单预计责任人 包装类,返回视图层所需的字段
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public class AftersalesPersonResponsibleWrapper extends BaseEntityWrapper<AftersalesPersonResponsibleEntity, AftersalesPersonResponsibleVO>  {
+
+	public static AftersalesPersonResponsibleWrapper build() {
+		return new AftersalesPersonResponsibleWrapper();
+ 	}
+
+	@Override
+	public AftersalesPersonResponsibleVO entityVO(AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		AftersalesPersonResponsibleVO aftersalesPersonResponsibleVO = Objects.requireNonNull(BeanUtil.copy(aftersalesPersonResponsible, AftersalesPersonResponsibleVO.class));
+
+		//User createUser = UserCache.getUser(aftersalesPersonResponsible.getCreateUser());
+		//User updateUser = UserCache.getUser(aftersalesPersonResponsible.getUpdateUser());
+		//aftersalesPersonResponsibleVO.setCreateUserName(createUser.getName());
+		//aftersalesPersonResponsibleVO.setUpdateUserName(updateUser.getName());
+
+		return aftersalesPersonResponsibleVO;
+	}
+
+
+}