修改处理结果填写

blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/ProcessorProcessingStatusStatusConstant.java

@@ -4,7 +4,8 @@ public enum ProcessorProcessingStatusStatusConstant {
 	daichuli("待处理","1"),
 	yichuli("已处理","2"),
 	yichaoshi("已超时","3"),
-	tijiaofang("处理结果提交方","4")
+	tijiaofang("处理结果提交方","4"),
+	qitachuli("其他处理","5")
 	;
 
 	ProcessorProcessingStatusStatusConstant(String name, String value) {

blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java

@@ -5,6 +5,7 @@ public enum WorkOrderStatusConstant {
 	daichuli("待处理","10"),
 	yichuli("已处理","30"),
 	chulizhong("处理中","20"),
+	chulijeiguoyitianxei("处理结果已填写","21"),
 	daishenhe("待审核","40"),
 	yishenhe("已审核","50"),
 	chaoshiweichuli("超时未处理","60"),

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

@@ -377,7 +377,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	}
 
 	/**
-	 * 客服异常工单 修改
+	 * 客服异常工单 修改 可修改订单状态
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -387,6 +387,20 @@ public class AftersalesWorkOrderController extends BladeController {
 		return R.status(aftersalesWorkOrderService.updateById(aftersalesWorkOrder));
 	}
 
+	/**
+	 * 客服异常工单 修改 可修改订单状态
+	 */
+	@PutMapping("/updateWorkOrderStatus")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改订单状态", notes = "传入aftersalesWorkOrder")
+	public R updateWorkOrderStatus(@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrder) {
+		log.info("修改参数》》》{}",aftersalesWorkOrder.toString());
+		if(aftersalesWorkOrder.getAssignList().isEmpty()){
+			throw new ServiceException("修改工单数据ID不能为空!!");
+		}
+		return R.status(aftersalesWorkOrderService.updateWorkOrderStatus(aftersalesWorkOrder));
+	}
+
 	/**
 	 * 客服异常工单 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
 	 */

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java

@@ -252,5 +252,10 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 */
 	void addAssignCustomerService(AftersalesWorkOrderDTO aftersalesWorkOrderDTO, BladeUser user);
 
-
+	/**
+	 * 批量修改订单状态
+	 * @param aftersalesWorkOrder
+	 * @return
+	 */
+	boolean updateWorkOrderStatus(AftersalesWorkOrderDTO aftersalesWorkOrder);
 }

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

@@ -195,6 +195,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 				});
 			}
+			//添加处理结果
+			if(ObjectUtils.isNotNull(aftersalesWorkOrder.getAftersalesProcessingResultsDTO())){
+				aftersalesWorkOrder.setWorkOrderStatus(WorkOrderStatusConstant.chulijeiguoyitianxei.getValue());
+			}
 			baseMapper.insert(aftersalesWorkOrder);
 
 		}else{
@@ -846,11 +850,14 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				.eq(AftersalesProcessorEntity::getWorkOrderId, aftersalesWorkOrder.getId())
 				.apply("conditions in (1,2)")
 			);
-
+			//需要待回复的处理方
 			List<AftersalesProcessorVO> processorVOS = list.stream().map( i ->{
-				AftersalesProcessorVO processorVO = new AftersalesProcessorVO();
-				BeanUtil.copyProperties(i,processorVO);
-				return processorVO;
+				if(i.getProcessingStatus().equals(ProcessorProcessingStatusStatusConstant.daichuli.getValue())){
+					AftersalesProcessorVO processorVO = new AftersalesProcessorVO();
+					BeanUtil.copyProperties(i,processorVO);
+					return processorVO;
+				}
+				return null;
 			}).collect(Collectors.toList());
 			aftersalesWorkOrderVO.setProcessorVOList(processorVOS);
 
@@ -1218,7 +1225,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			updateWrapper.set("processed_by_id",user.getUserId());
 			updateWrapper.set("processed_by_name",user.getUserName());
 			aftersalesReplyingPartyService.update(updateWrapper);
-
+			AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
+			workOrderEntity.setId(aftersalesWorkOrderDTO.getId());
+			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.chulizhong.getValue());
+			baseMapper.updateById(workOrderEntity);
 			//添加或修改新的处理方
 			chuLiFang(aftersalesWorkOrderDTO, myCurrentWarehouse, user, list, surveyRecordDTO);
 
@@ -1298,7 +1308,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		//修改异常工单处理信息！
 		AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
 		workOrderEntity.setId(aftersalesWorkOrderDTO.getId());
-		workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yichuli.getValue());
+		workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.chulijeiguoyitianxei.getValue());
 		workOrderEntity.setCompletionName(myCurrentWarehouse.getName());
 		workOrderEntity.setCompletionId(myCurrentWarehouse.getId());
 		baseMapper.updateById(workOrderEntity);
@@ -1314,11 +1324,21 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 //			throw new ServiceException("处理方信息不存在！！");
 			log.info("异常工单处理结果》》》不是处理方提交数据");
 			//查询处理方待回复的；
-
-
-
-
-
+			list.stream().forEach( i ->{
+				AftersalesProcessorEntity  processor = new AftersalesProcessorEntity();
+				processor.setId(i.getId());
+				processor.setProcessingStatus(ProcessorProcessingStatusStatusConstant.qitachuli.getValue());
+				aftersalesProcessorService.updateById(processor);
+			});
+			List<AftersalesReplyingPartyEntity> list1 = aftersalesReplyingPartyService.list(Wrappers.<AftersalesReplyingPartyEntity>query().lambda()
+				.eq(AftersalesReplyingPartyEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId())
+			);
+			list1.stream().forEach(i ->{
+				AftersalesReplyingPartyEntity replyingPartyEntity = new AftersalesReplyingPartyEntity();
+				replyingPartyEntity.setId(i.getId());
+				replyingPartyEntity.setDifference("3");
+				aftersalesReplyingPartyService.updateById(replyingPartyEntity);
+			});
 		}else{
 			Optional<AftersalesProcessorEntity> first = list.stream().filter(i -> i.getBusinessId().equals(myCurrentWarehouse.getId()) && i.getBusinessName().equals(myCurrentWarehouse.getName())).findFirst();
 			if(first.isPresent()){
@@ -1606,6 +1626,22 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	}
 
+	/**
+	 * 批量修改工单状态为已处理
+	 * @param aftersalesWorkOrder
+	 * @return
+	 */
+	@Override
+	public boolean updateWorkOrderStatus(AftersalesWorkOrderDTO aftersalesWorkOrder) {
+		aftersalesWorkOrder.getAssignList().forEach(i ->{
+			AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
+			workOrderEntity.setId(i);
+			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yichuli.getValue());
+			baseMapper.updateById(workOrderEntity);
+		});
+		return true;
+	}
+
 	/**
 	 * 添加处理处理方信息
 	 * @param aftersalesWorkOrderDTO