diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java
index 3e6ddd0c0..a76731372 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java
@@ -283,6 +283,10 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
* 处理仓库名称
*/
private String completionName;
+ /**
+ * 品牌名称
+ */
+ private String brandName;
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 e385c1ee0..77b148af1 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
@@ -201,6 +201,14 @@ public class AftersalesWorkOrderController extends BladeController {
if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getId())){
throw new ServiceException("异常工单ID不能为空");
}
+ try{
+ if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getSurveyRecordDTO().getContent())){
+ throw new ServiceException("内容不能为空！！");
+ }
+ }catch (Exception e ){
+ log.info("内容不能为空！！");
+ throw new ServiceException("内容不能为空！！");
+ }
return R.status(aftersalesWorkOrderService.savaSurveyRecord(aftersalesWorkOrderDTO));
}
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 cf62eb9a1..999c41613 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
@@ -54,10 +54,11 @@
select DISTINCT lawo.id,lawo.work_order_type,lawo.discovery_node,lawo.work_order_number,lawo.waybill_number,lawo.order_code,lawo.train_number,lawo.first,
lawo.secondary,lawo.vehicle_route,lawo.deliver_goods_time,lawo.discovery_time,lawo.warehousing_time,lawo.waybill_mall,lawo.remarks,lawo.delivery_time,
lawo.delivery_driver,lawo.work_order_status,lawo.problem_description,lawo.responsible_person,lawo.processed_by,lawo.create_time,
- lawo.customer_service_name customerServiceName
+ lawo.customer_service_name customerServiceName,lawo.warehouse_id warehouseId,lawo.brand_name brandName
from logpm_aftersales_work_order lawo
LEFT JOIN logpm_aftersales_processor lap on lawo.id = lap.work_order_id and lap.types_of = '2' and lap.conditions in (1,2)
+ lawo.is_deleted = 0
and lawo.id = #{param.id }
and lawo.work_order_type = #{param.workOrderType }
and lawo.initiation_identification = #{param.initiationIdentification }
@@ -87,7 +88,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lawo.customer_service_name = #{param.customerServiceName }
and lawo.waybill_mall_id = #{param.waybillMallId }
and lawo.problem_description = #{param.problemDescription}
- and lawo.warehouse_id = #{param.warehouseId}
+ and lawo.warehouse_id = #{param.warehouseId}
and lawo.person_responsible = #{param.personResponsible }
and lawo.process_number = #{param.processNumber }
and lawo.reviewed_by = #{param.reviewedBy }
@@ -96,18 +97,21 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lawo.processed_by = #{param.processedBy}
and lawo.investigation_process = #{param.investigationProcess }
and lawo.related_work_orders_id = #{param.relatedWorkOrdersId }
- and lawo.work_order_status in( #{param.workOrderStatus })
+ and lawo.work_order_status in( #{param.workOrderStatus })
and lawo.work_order_status IN ( '10', '20', '21', '30', '40', '50', '60', '70', '80', '90' ,'100','110')
and lawo.work_order_status in (21,30) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId}
- and lawo.warehouse_id = #{param.warehouseId}
- and lawo.work_order_status in( #{param.workOrderStatus })
- or 1 = 1
- and lawo.work_order_status in ( #{param.workOrderStatus }) and lap.types_of = '2' and lap.business_id = #{param.warehouseId}
- and lap.types_of = '2' and lap.business_id = #{param.warehouseId}
- and lawo.work_order_status in (21,30) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId}
- and lawo.work_order_status in (80,100) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId}
+
+ and lawo.work_order_status in (80,100) and lap.processing_status = '4'
+ or 1=1
+ and lap.business_id = #{param.warehouseId}
+ and lawo.work_order_status in ( #{param.workOrderStatus })
+
+ and lawo.work_order_status in ('10','20' ) and lap.types_of = '2' and lap.processing_status in ('1')
+ and lap.types_of = '2'
+ and lawo.work_order_status in (21,30) and lap.processing_status = '4'
+ and lawo.work_order_status in (80,100) and lap.processing_status = '4'
ORDER BY lawo.create_time DESC
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index 9f0c2a3df..92951afbb 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -594,6 +594,14 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl collect = list.stream().filter(i -> "1".equals(i.getProcessingStatus())).collect(Collectors.toList());
+// List collect = list.stream().filter(i -> "1".equals(i.getProcessingStatus())).collect(Collectors.toList());
//添加待回复信息
- collect.forEach( i ->{
-
- AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordEntity);
- //添加待回复信息
- aftersalesReplyingPartyService.save(replyingPartyEntity);
+ list.forEach( i ->{
+ //没有处理方，修改已回复的处理方为待回复
+ if(ProcessorProcessingStatusStatusConstant.yichuli.getValue().equals(i.getProcessingStatus())){
+ //已处理
+ AftersalesProcessorEntity processor = new AftersalesProcessorEntity();
+ processor.setId(i.getId());
+ processor.setProcessingStatus(ProcessorProcessingStatusStatusConstant.daichuli.getValue());
+ aftersalesProcessorService.updateById(processor);
+ }
+ if(ProcessorProcessingStatusStatusConstant.daichuli.getValue().equals(i.getProcessingStatus())){
+ AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordEntity);
+ //添加待回复信息
+ aftersalesReplyingPartyService.save(replyingPartyEntity);
+ }
});
}else{