修改查询工单详情

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java

@@ -56,7 +56,9 @@ public class AftersalesWorkOrderVO extends AftersalesWorkOrderEntity {
 	 */
 	private List<AftersalesDecreaseImageVO> decreaseImageVOList;
 
-
+	/**
+	 *  常工单处理结果
+	 */
 	private AftersalesProcessingResultsVO processingResultsVO;
 	/**
 	 * 处理方名称
@@ -71,7 +73,14 @@ public class AftersalesWorkOrderVO extends AftersalesWorkOrderEntity {
 	 * processor表 处理方ID
 	 */
 	private Long processorId;
-
+	/**
+	 * 工单调查记录表
+	 */
 	private List<AftersaleSurveyRecordEntity> surveyRecordEntities;
+	/**
+	 * 预计责任人信息
+	 */
+	private List<AftersalesPersonResponsibleVO> personResponsibleVOS;
+
 
 }

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

@@ -159,6 +159,19 @@ public class AftersalesWorkOrderController extends BladeController {
 		  aftersalesWorkOrderService.getIsItTimeout();
 	}
 
+	/**
+	 * 客服异常工单 修改理赔工单是否可以申述
+	 */
+//	@GetMapping("/isItTimeout")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "修改理赔工单是否可以申述", notes = "传入aftersalesWorkOrder")
+	@XxlJob("modifyClaimStatus")
+//	@Scheduled(cron = "0 0/1 * * * ?")
+	public void updateModifyClaimStatus() {
+		log.info("查询处理超时的数据>>>>>>>>");
+		  aftersalesWorkOrderService.getIsItTimeout();
+	}
+
 
 	/**
 	 * 客服异常工单 查询客服人员信息
@@ -305,11 +318,11 @@ public class AftersalesWorkOrderController extends BladeController {
 
 
 	/**
-	 * 客服异常工单 查询处理结果信息数据
+	 * 客服异常工单 查询处理结果全部信息数据
 	 */
 	@GetMapping("/getProcessingResults")
 	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "客服异常工单 查询处理结果信息数据", notes = "传入aftersalesWorkOrder")
+	@ApiOperation(value = "客服异常工单 查询详情全部信息数据", notes = "传入aftersalesWorkOrder")
 	public R getProcessingResults(AftersalesWorkOrderDTO  aftersalesWorkOrder) {
 		if(ObjectUtils.isNull(aftersalesWorkOrder.getId())){
 			return R.fail("异常工单ID不能为空！！");

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

@@ -20,6 +20,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.aftersales.bean.Resp;
@@ -33,6 +34,7 @@ import com.logpm.aftersales.service.*;
 import com.logpm.aftersales.vo.*;
 import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.logpm.aftersales.mapper.AftersalesWorkOrderMapper;
+import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.feign.IDistributionDeliveryListClient;
@@ -745,7 +747,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			aftersalesWorkOrderVO.setProcessorVOList(processorVOS);
 
 			//查询包件
-
 			List<AftersalesAbnormalPackageEntity> list1 = aftersalesAbnormalPackageService.list(Wrappers.<AftersalesAbnormalPackageEntity>query().lambda()
 				.eq(AftersalesAbnormalPackageEntity::getWorkOrderId, aftersalesWorkOrder.getId())
 			);
@@ -773,6 +774,20 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			if(ObjectUtils.isNotNull(queryProcessing)){
 				aftersalesWorkOrderVO.setProcessingResultsVO(queryProcessing);
 			}
+			//查询预计责任人查询
+			List<AftersalesPersonResponsibleEntity> list3 = aftersalesPersonResponsibleService.list(Wrappers.<AftersalesPersonResponsibleEntity>query().lambda()
+				.eq(AftersalesPersonResponsibleEntity::getWordOrderId, aftersalesWorkOrder.getId())
+			);
+			if(!list.isEmpty()){
+				List<AftersalesPersonResponsibleVO> personResponsibleVOList = new ArrayList<>();
+				list3.forEach( i ->{
+					AftersalesPersonResponsibleVO personResponsibleVO = new AftersalesPersonResponsibleVO();
+					BeanUtil.copyProperties(i,personResponsibleVO);
+					personResponsibleVOList.add(personResponsibleVO);
+				});
+				aftersalesWorkOrderVO.setPersonResponsibleVOS(personResponsibleVOList);
+			}
+
 		}
 
 		return aftersalesWorkOrderVO;
@@ -952,6 +967,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	 * 异常工单   客服仲裁完结
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public boolean addArbitrateEnd(AftersalesWorkOrderDTO aftersalesWorkOrder) {
 		BladeUser user = AuthUtil.getUser();
 		for (Long l : aftersalesWorkOrder.getAssignList()) {
@@ -977,12 +993,13 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			aftersalesWorkOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yiwanjei.getValue());
 			baseMapper.updateById(aftersalesWorkOrderEntity);
 			//修改
-			LambdaUpdateWrapper<AftersalesArbitrationOrderEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-			lambdaUpdateWrapper.eq(AftersalesArbitrationOrderEntity::getWorkOrderId,l);
-			lambdaUpdateWrapper.set(AftersalesArbitrationOrderEntity::getOperateType,"客服完结");
-			lambdaUpdateWrapper.set(AftersalesArbitrationOrderEntity::getTypesOf,WorkOrderTypesOfStatusConstant.jeishu.getValue());
+			UpdateWrapper<AftersalesArbitrationOrderEntity> lambdaUpdateWrapper = new UpdateWrapper<>();
+			lambdaUpdateWrapper.eq("work_order_id",l);
+			lambdaUpdateWrapper.set("operate_type","客服完结");
+			lambdaUpdateWrapper.set("types_of",WorkOrderTypesOfStatusConstant.jeishu.getValue());
 			aftersalesArbitrationOrderService.update(lambdaUpdateWrapper);
 
+
 			//添加跟踪记录
 			AftersaleSurveyRecordEntity surveyRecordEntity = new AftersaleSurveyRecordEntity();
 			AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = changName(aftersalesWorkOrder, user);