修改工单处理提交问题

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesArbitrationOrderEntity.java

@@ -85,4 +85,9 @@ public class AftersalesArbitrationOrderEntity extends TenantEntity {
 	 */
 	private String customerServiceName;
 
+	/**
+	 * 申请原因
+	 */
+	private String reasonRemarks;
+
 }

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

@@ -163,6 +163,9 @@ public class AftersalesWorkOrderController extends BladeController {
 			if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getAftersalesProcessingResultsDTO())){
 				throw new ServiceException("异常工单处理结果不能为空");
 			}
+			if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getResultIdentification())){
+				throw new ServiceException("异常工单处理结果标识不能为空！！");
+			}
 			try {
 				return R.status(aftersalesWorkOrderService.addProcessingResults(aftersalesWorkOrderDTO));
 			}catch (ServiceException s){
@@ -212,7 +215,11 @@ public class AftersalesWorkOrderController extends BladeController {
 		try{
 			List<User> list =  aftersalesWorkOrderService.getCustomerServicePersonnel();
 			return R.data(list);
-		}catch(Exception e){
+		}catch(ServiceException s){
+			log.error("查询客服人员信息>>>>{}",s.getMessage());
+			return R.fail(s.getMessage());
+		}
+		catch(Exception e){
 			log.error("查询客服人员信息>>>>{}",e.getMessage());
 			return R.fail("系统异常！！");
 		}
@@ -481,6 +488,9 @@ public class AftersalesWorkOrderController extends BladeController {
 		if(ObjectUtils.isNull(aftersalesWorkOrder) || aftersalesWorkOrder.getAssignList().isEmpty()){
 			throw new ServiceException("数据不能为空！！");
 		}
+		if(ObjectUtils.isNull(aftersalesWorkOrder) || aftersalesWorkOrder.getReasonRemarks().isEmpty()){
+			throw new ServiceException("申请理由不能为空！！");
+		}
 		try {
 			return R.status(aftersalesWorkOrderService.updateArbitrate(aftersalesWorkOrder));
 		}catch (ServiceException s){
@@ -528,10 +538,28 @@ public class AftersalesWorkOrderController extends BladeController {
 			log.error("工单修改异常》》》{}",e.getMessage());
 			return R.fail("系统异常！！");
 		}
-
 	}
 
 
+	/**
+	 * 客服异常工单 修改客服结束仲裁
+	 */
+	@PostMapping("/updateArbitrateStatus")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesWorkOrder")
+	public R updateArbitrateStatus (@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrder) {
+		log.info("修改参数》》》{}",aftersalesWorkOrder.toString());
+		if(ObjectUtils.isNull(aftersalesWorkOrder) || ObjectUtils.isNull( aftersalesWorkOrder.getAssignList())){
+			throw new ServiceException("参数不全assignList!");
+		}
+		try {
+			return R.status(aftersalesWorkOrderService.updateArbitrateStatus(aftersalesWorkOrder));
+		}catch (Exception e){
+			log.error("工单修改异常》》》{}",e.getMessage());
+			return R.fail("系统异常！！");
+		}
+	}
+
 	/**
 	 * 客服异常工单 客服经理确定数据
 	 */

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java

@@ -129,5 +129,19 @@ public class AftersalesWorkOrderDTO extends AftersalesWorkOrderEntity {
 	 */
 	private Long appealId;
 
+	/**
+	 * 申述原因
+	 */
+	private String reasonRemarks;
+
+	/**
+	 * 是否提交处理结果标识 1 是 2 否
+	 */
+	private String resultIdentification;
+	/**
+	 * 是否提交到理赔金额未出标识 1 是
+	 */
+	private String claimIdentification;
+
 
 }

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

@@ -179,7 +179,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
     </select>
     <select id="getListSettlement" resultType="com.logpm.aftersales.entity.AftersalesSettlementEntity">
         select las.work_order_number workOrderNumber,las.business_name businessName,las.brand_name brandName,las.mall_name mallName,
-        GROUP_CONCAT(DISTINCT las.waybill_number) AS waybillNumber,
+        las.waybill_number AS waybillNumber,
         las.work_order_type workOrderType,las.result_type resultType,las.laprId,  las.discovery_node discoveryNode, las.result_description resultDescription,
         las.vehicle_route vehicleRoute,las.indemnitor,las.reason,las.money,las.lawoId,las.create_time createTime,las.process_number processNumber,
         las.work_order_status workOrderStatus

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

@@ -273,4 +273,11 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @return
 	 */
 	boolean updateByIdAppel(AftersalesAppealEntity aftersalesAppeal);
+
+	/**
+	 * 修改结束仲裁状态
+	 * @param aftersalesWorkOrder
+	 * @return
+	 */
+	boolean updateArbitrateStatus(AftersalesWorkOrderDTO aftersalesWorkOrder);
 }

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

@@ -899,11 +899,12 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	public R updateAssignCustomerService(AftersalesWorkOrderDTO aftersalesWorkOrderDTO) {
 		BladeUser user = AuthUtil.getUser();
 		for (Long i : aftersalesWorkOrderDTO.getAssignList()) {
+
 			//查询有没有指派过
 			AftersalesWorkOrderEntity workOrderEntity = baseMapper.selectById(i);
-			if(ObjectUtils.isNotNull(workOrderEntity.getCustomerServiceId())){
-				throw new ServiceException("包含已指派的工单数据！请勿重复指派！");
-			}
+//			if(ObjectUtils.isNotNull(workOrderEntity.getCustomerServiceId())){
+//				throw new ServiceException("包含已指派的工单数据！请勿重复指派！");
+//			}
 
 			AftersalesWorkOrderEntity aftersalesWorkOrder = new AftersalesWorkOrderVO();
 			aftersalesWorkOrder.setCustomerServiceId(aftersalesWorkOrderDTO.getCustomerServiceId());
@@ -1139,6 +1140,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			});
 			String roleIds = stringList.stream().collect(Collectors.joining(","));
 			R<List<User>> listR = userSearchClient.listByRole(roleIds); //查询角色下的所有人员数据
+
+
 			return listR.getData();
 		}
 	}
@@ -1162,6 +1165,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			aftersalesArbitrationOrderEntity.setWorkOrderId(i);
 			aftersalesArbitrationOrderEntity.setOperateType("正常");
 			aftersalesArbitrationOrderEntity.setTypesOf(WorkOrderTypesOfStatusConstant.kaiqi.getValue());
+			aftersalesArbitrationOrderEntity.setReasonRemarks(aftersalesWorkOrder.getReasonRemarks());
 			arbitrationOrderList.add(aftersalesArbitrationOrderEntity);
 			//添加跟踪记录
 			AftersaleSurveyRecordEntity surveyRecordEntity = new AftersaleSurveyRecordEntity();
@@ -1176,7 +1180,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		if(!arbitrationOrderList.isEmpty()){
 			//添加仲裁记录
 			aftersalesArbitrationOrderService.saveBatch(arbitrationOrderList);
-
 			return true;
 		}
 		return false;
@@ -1465,9 +1468,19 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		//修改异常工单处理信息！
 		AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
 		workOrderEntity.setId(aftersalesWorkOrderDTO.getId());
-		if(!byId.getWorkOrderStatus().equals(WorkOrderStatusConstant.lipeijineweichu.getValue())){
+//		if(!byId.getWorkOrderStatus().equals(WorkOrderStatusConstant.lipeijineweichu.getValue())){
+//			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.chulijeiguoyitianxei.getValue());
+//		}
+		//是否为已提交
+		if("1".equals(aftersalesWorkOrderDTO.getResultIdentification())){
+			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yichuli.getValue());
+		}else{
 			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.chulijeiguoyitianxei.getValue());
 		}
+		//是否为已提交
+		if("1".equals(aftersalesWorkOrderDTO.getClaimIdentification())){
+			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.lipeijineweichu.getValue());
+		}
 		workOrderEntity.setCompletionName(myCurrentWarehouse.getName());
 		workOrderEntity.setCompletionId(myCurrentWarehouse.getId());
 		baseMapper.updateById(workOrderEntity);
@@ -1921,6 +1934,21 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		return aftersalesAppealService.updateById(aftersalesAppeal) > 0;
 	}
 
+	/**
+	 * 修改结束仲裁
+	 * @param aftersalesWorkOrder
+	 * @return
+	 */
+	@Override
+	public boolean updateArbitrateStatus(AftersalesWorkOrderDTO aftersalesWorkOrder) {
+		//修改
+		LambdaUpdateWrapper<AftersalesWorkOrderEntity> updateWrapper = new LambdaUpdateWrapper<>();
+		updateWrapper.in(AftersalesWorkOrderEntity::getId,aftersalesWorkOrder.getAssignList());
+		updateWrapper.set(AftersalesWorkOrderEntity::getWorkOrderStatus,WorkOrderStatusConstant.chulizhong.getValue());
+		baseMapper.update(aftersalesWorkOrder,updateWrapper);
+		return true;
+	}
+
 	/**
 	 * 添加处理处理方信息
 	 * @param aftersalesWorkOrderDTO