修改异常工单

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

@@ -13,7 +13,9 @@ public enum WorkOrderStatusConstant {
 	yiwanjei("完结","80"),
 	lipeijineweichu("理赔金额未出","90"),
 	shenshuzhong("申述中","100"),
-	yijeishu("已结束","110")
+	yijeishu("已结束","110"),
+	yuzhangdan("预账单","120"),
+	quedingzhangdan("确定账单","130")
 
 	;
 

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

@@ -387,8 +387,24 @@ public class AftersalesWorkOrderController extends BladeController {
 		return R.status(aftersalesWorkOrderService.updateById(aftersalesWorkOrder));
 	}
 
+
 	/**
-	 * 客服异常工单 修改 可修改订单状态
+	 * 客服异常工单 客服经理确定数据
+	 */
+	@PutMapping("/updateManagerConfirmed")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesWorkOrder")
+	public R updateManagerConfirmed(@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrder) {
+		log.info("客服经理确定数据》》》{}",aftersalesWorkOrder.toString());
+		if(aftersalesWorkOrder.getAssignList().isEmpty()){
+			throw new ServiceException("确定工单ID不能为空！！");
+		}
+
+		return R.status(  	aftersalesWorkOrderService.updateManagerConfirmed(aftersalesWorkOrder) );
+	}
+
+	/**
+	 * 客服异常工单 修改 批量修改工单状态为已处理
 	 */
 	@PutMapping("/updateWorkOrderStatus")
 	@ApiOperationSupport(order = 5)

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/jobhandler/AftersalesXxlJob.java

@@ -28,7 +28,7 @@ public class AftersalesXxlJob {
 
 	@XxlJob("modifyClaimStatus")
 	public  ReturnT<String> updateModifyClaimStatus(String param) throws Exception {
-		logger.info("修改理赔工单是否可以申述>>>>>>>>{}",param);
+		logger.info("修改预账单工单是否可以申述>>>>>>>>{}",param);
 		aftersalesWorkOrderService.updateModifyClaimStatus();
 		return ReturnT.SUCCESS;
 	}

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

@@ -258,4 +258,11 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @return
 	 */
 	boolean updateWorkOrderStatus(AftersalesWorkOrderDTO aftersalesWorkOrder);
+
+	/**
+	 * 客服经理确定数据修改为预约账单
+	 * @param aftersalesWorkOrder
+	 * @return
+	 */
+	boolean updateManagerConfirmed(AftersalesWorkOrderDTO aftersalesWorkOrder);
 }

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

@@ -1554,9 +1554,14 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 		AftersalesSettlementEntity settlementEntity = new AftersalesSettlementEntity();
 		List<AftersalesSettlementEntity> settlementEntityList = baseMapper.getWholeListSettlement(settlementEntity);
-		List<AftersalesSettlementEntity> list = new ArrayList<>();
+
+		List<AftersalesWorkOrderEntity> aftersalesWorkOrderEntities = baseMapper.selectList(Wrappers.<AftersalesWorkOrderEntity>query().lambda()
+			.eq(AftersalesWorkOrderEntity::getWorkOrderStatus, WorkOrderStatusConstant.yuzhangdan.getValue())
+		);
+
+		List<AftersalesWorkOrderEntity> list = new ArrayList<>();
 		if(!settlementEntityList.isEmpty()){
-			for (AftersalesSettlementEntity i : settlementEntityList) {
+			for (AftersalesWorkOrderEntity i : aftersalesWorkOrderEntities) {
 				if(ObjectUtils.isNotNull(i.getOverTime())){
 					// 获取当前时间
 					LocalDateTime now = LocalDateTime.now();
@@ -1579,8 +1584,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				list.forEach( i ->{
 					//修改数据
 					AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
-					workOrderEntity.setId(i.getLawoId());
-					workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yijeishu.getValue());
+					workOrderEntity.setId(i.getId());
+					workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.quedingzhangdan.getValue());
 					baseMapper.updateById(workOrderEntity);
 				});
 		}
@@ -1672,6 +1677,24 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		return true;
 	}
 
+	/**
+	 * 客服异常工单 客服经理确定数据
+	 * @param aftersalesWorkOrder
+	 * @return
+	 */
+	@Override
+	public boolean updateManagerConfirmed(AftersalesWorkOrderDTO aftersalesWorkOrder) {
+
+		aftersalesWorkOrder.getAssignList().forEach(i ->{
+			AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
+			workOrderEntity.setId(i);
+			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yuzhangdan.getValue());
+			baseMapper.updateById(workOrderEntity);
+		});
+
+		return true;
+	}
+
 	/**
 	 * 添加处理处理方信息
 	 * @param aftersalesWorkOrderDTO