From e7146efada6f6f787c216fd38c887205e4a52eb2 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Tue, 12 Dec 2023 10:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=AE=8C?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AftersalesCompletionRecordEntity.java | 2 +- .../AftersalesPersonResponsibleEntity.java | 5 +++++ .../AftersalesCompletionRecordController.java | 3 +++ .../AftersalesWorkOrderController.java | 17 ++++++++++++++ .../service/IAftersalesWorkOrderService.java | 7 ++++++ .../impl/AftersalesWorkOrderServiceImpl.java | 22 +++++++++++++++++-- 6 files changed, 53 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java index 5b67aff9f..6b4948171 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java @@ -78,7 +78,7 @@ public class AftersalesCompletionRecordEntity extends TenantEntity { @ApiModelProperty(value = "说明") private String explain; /** - * 财务是否处理 + * 财务是否处理 1是 2 否 */ @ApiModelProperty(value = "财务是否处理") private String accounting; diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesPersonResponsibleEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesPersonResponsibleEntity.java index 1c92d6416..d0bc4ce86 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesPersonResponsibleEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesPersonResponsibleEntity.java @@ -96,6 +96,11 @@ public class AftersalesPersonResponsibleEntity extends TenantEntity { */ @ApiModelProperty(value = "责任方名称") private String businessName; + /** + * 说明 + */ + @ApiModelProperty(value = "说明") + private String description; /** * 责任方ID */ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecordController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecordController.java index a7c436c89..bfcb3581c 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecordController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecordController.java @@ -23,6 +23,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import javax.validation.Valid; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -53,6 +54,7 @@ import javax.servlet.http.HttpServletResponse; */ @RestController @AllArgsConstructor +@Slf4j @RequestMapping("/aftersalesCompletionRecord") @Api(value = "异常工单完结处理结果赔款方", tags = "异常工单完结处理结果赔款方接口") public class AftersalesCompletionRecordController extends BladeController { @@ -108,6 +110,7 @@ public class AftersalesCompletionRecordController extends BladeController { @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入aftersalesCompletionRecord") public R update(@Valid @RequestBody AftersalesCompletionRecordEntity aftersalesCompletionRecord) { + log.info("赔货方信息修改》》》》{}",aftersalesCompletionRecord); return R.status(aftersalesCompletionRecordService.updateById(aftersalesCompletionRecord)); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java index 140ecdd09..550d51467 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -186,6 +186,23 @@ public class AftersalesWorkOrderController extends BladeController { } + /** + * 工单调查记录表 查询全部跟踪记录 + */ + @GetMapping("/getTrackRecord") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "查询全部跟踪记录", notes = "传入aftersaleSurveyRecord") + public R getTrackRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO) { + log.info("查询全部跟踪记录》》》{}", aftersalesWorkOrderDTO); + + if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getId())){ + throw new ServiceException("异常工单ID不能为空"); + } + AftersalesWorkOrderVO list = aftersalesWorkOrderService.getTrackRecord(aftersalesWorkOrderDTO); + return R.data(list); + } + + /** * 客服异常工单 查询营业部责任人人员信息 */ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java index 4f351f296..cb97d746b 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java @@ -200,4 +200,11 @@ public interface IAftersalesWorkOrderService extends BaseService list = aftersaleSurveyRecordService.list(Wrappers.query().lambda() .eq(AftersaleSurveyRecordEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId()) - .eq(AftersaleSurveyRecordEntity::getFollowWarehouseId, myCurrentWarehouse.getId()) - .eq(AftersaleSurveyRecordEntity::getFollowWarehouseName, myCurrentWarehouse.getName()) .eq(AftersaleSurveyRecordEntity::getDifference, "1") ); AftersalesWorkOrderVO aftersalesWorkOrderVO = new AftersalesWorkOrderVO(); @@ -1010,6 +1008,21 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl list = aftersaleSurveyRecordService.list(Wrappers.query().lambda() + .eq(AftersaleSurveyRecordEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId()) + ); + AftersalesWorkOrderVO workOrderVO = new AftersalesWorkOrderVO(); + workOrderVO.setSurveyRecordEntities(list); + return workOrderVO; + } + /** * 添加处理处理方信息 * @param aftersalesWorkOrderDTO @@ -1039,6 +1052,11 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl