diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java index 2f171f98a..b03e79530 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java @@ -11,7 +11,9 @@ public enum WorkOrderStatusConstant { zhongchaizhong("仲裁中","70"), yiwanjei("完结","80"), lipeijineweichu("理赔金额未出","90"), - shenshuzhong("申述中","100") + shenshuzhong("申述中","100"), + yijeishu("已结束","110") + ; diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java index fa9f69765..e47db337e 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java @@ -16,9 +16,7 @@ */ package com.logpm.aftersales.vo; -import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity; -import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity; -import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; +import com.logpm.aftersales.entity.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -82,5 +80,14 @@ public class AftersalesWorkOrderVO extends AftersalesWorkOrderEntity { */ private List personResponsibleVOS; + /** + * 工单调查记录表 + */ + private List completionRecordEntities; + /** + * 预计责任人信息 + */ + private List completionRecipientEntityList; + } 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 31485a653..391b58fd3 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 @@ -166,7 +166,7 @@ public class AftersalesWorkOrderController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "修改理赔工单是否可以申述", notes = "传入aftersalesWorkOrder") @XxlJob("modifyClaimStatus") -// @Scheduled(cron = "0 0/1 * * * ?") + @Scheduled(cron = "0 0/1 * * * ?") public void updateModifyClaimStatus() { log.info("修改理赔工单是否可以申述>>>>>>>>"); aftersalesWorkOrderService.updateModifyClaimStatus(); diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java index 262cde433..4694c04f3 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java @@ -83,5 +83,5 @@ public interface AftersalesWorkOrderMapper extends BaseMapper getWholeListSettlement(); + List getWholeListSettlement(@Param("param") AftersalesSettlementEntity aftersalesSettlementEntity); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml index a630adcad..5285bcf11 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml @@ -146,7 +146,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d las.work_order_status workOrderStatus,las.over_time overTime,las.business_id businessId from logpm_aftersales_settlement las - and las.business_id = #{ param.businessId } + and las.business_id = #{ param.businessId }