修改异常工单回复

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

@@ -51,10 +51,11 @@
     </resultMap>
     <!--查询完整的异常工单信息-->
     <select id="pageListOwn" resultType="com.logpm.aftersales.entity.AftersalesWorkOrderEntity">
-        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,
+        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.delivery_driver,lawo.work_order_status,lawo.problem_description,lawo.responsible_person,lawo.processed_by,lawo.create_time
         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)
         <where>
             <if test="param.id != null and param.id != '' ">and  lawo.id = #{param.id } </if>
             <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
@@ -96,6 +97,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.customerIdentification != null and param.customerIdentification == 1 ">
                      and  lawo.work_order_status in  ('10','20','30','40','50','60','70','80','90') and lawo.customer_service_id is null
             </if>
+            ORDER BY lawo.create_time DESC
         </where>
 
     </select>

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

@@ -1235,27 +1235,45 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	 * @param surveyRecordDTO
 	 */
 	private void chuLiFang(AftersalesWorkOrderDTO aftersalesWorkOrderDTO, BasicdataWarehouseEntity myCurrentWarehouse, BladeUser user, List<AftersalesProcessorEntity> list, AftersaleSurveyRecordDTO surveyRecordDTO) {
-		aftersalesWorkOrderDTO.getProcessorEntityList().forEach( i ->{
-			Optional<AftersalesProcessorEntity> first = list.stream().filter(a -> a.getBusinessId().equals(i.getBusinessId())).findFirst();
+		if(!aftersalesWorkOrderDTO.getProcessorEntityList().isEmpty()){
+			aftersalesWorkOrderDTO.getProcessorEntityList().forEach( i ->{
+				Optional<AftersalesProcessorEntity> first = list.stream().filter(a -> a.getBusinessId().equals(i.getBusinessId())).findFirst();
 
-			if(first.isPresent()){
-				//修改处理方 处理状态
-				updateProcessor(ProcessorProcessingStatusStatusConstant.daichuli.getValue(),first.get());
-			}else{
-				//不存在 添加处理方信息
-				AftersalesProcessorEntity processor = addProcessor(aftersalesWorkOrderDTO, myCurrentWarehouse, i);
-				processor.setConditions(ProcessorConditionsStatusConstant.xinzeng.getValue());
-				processor.setAssignTime(new Date());
-				//添加处理方
-				aftersalesProcessorService.save(processor);
-			}
-			//添加指定处理结果
-			//处理方
-			addSurveRecord(aftersalesWorkOrderDTO, user, i);
-			AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordDTO);
+				if(first.isPresent()){
+					//修改处理方 处理状态
+					updateProcessor(ProcessorProcessingStatusStatusConstant.daichuli.getValue(),first.get());
+				}else{
+					//不存在 添加处理方信息
+					AftersalesProcessorEntity processor = addProcessor(aftersalesWorkOrderDTO, myCurrentWarehouse, i);
+					processor.setConditions(ProcessorConditionsStatusConstant.xinzeng.getValue());
+					processor.setAssignTime(new Date());
+					//添加处理方
+					aftersalesProcessorService.save(processor);
+				}
+				//添加指定处理结果
+				//处理方
+				addSurveRecord(aftersalesWorkOrderDTO, user, i);
+				AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordDTO);
+				//添加待回复信息
+				aftersalesReplyingPartyService.save(replyingPartyEntity);
+			});
+
+		}else{
+			//没有 全部
+			List<AftersalesProcessorEntity> collect = list.stream().filter(i -> "1".equals(i.getProcessingStatus())).collect(Collectors.toList());
 			//添加待回复信息
-			aftersalesReplyingPartyService.save(replyingPartyEntity);
-		});
+			collect.forEach( i ->{
+				//修改处理方 处理状态
+				updateProcessor(ProcessorProcessingStatusStatusConstant.daichuli.getValue(),i);
+				//添加指定处理结果
+				addSurveRecord(aftersalesWorkOrderDTO, user, i);
+				AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordDTO);
+				//添加待回复信息
+				aftersalesReplyingPartyService.save(replyingPartyEntity);
+			});
+		}
+
+
 	}
 
 	/**