工单查询完结信息

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

@@ -11,7 +11,9 @@ public enum WorkOrderStatusConstant {
 	zhongchaizhong("仲裁中","70"),
 	yiwanjei("完结","80"),
 	lipeijineweichu("理赔金额未出","90"),
-	shenshuzhong("申述中","100")
+	shenshuzhong("申述中","100"),
+	yijeishu("已结束","110")
+
 	;
 
 

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

@@ -16,9 +16,7 @@
  */
 package com.logpm.aftersales.vo;
 
-import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
-import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity;
-import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
+import com.logpm.aftersales.entity.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -82,5 +80,14 @@ public class AftersalesWorkOrderVO extends AftersalesWorkOrderEntity {
 	 */
 	private List<AftersalesPersonResponsibleVO> personResponsibleVOS;
 
+	/**
+	 * 工单调查记录表
+	 */
+	private List<AftersalesCompletionRecordEntity> completionRecordEntities;
+	/**
+	 * 预计责任人信息
+	 */
+	private List<AftersalesCompletionRecipientEntity> completionRecipientEntityList;
+
 
 }

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

@@ -166,7 +166,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "修改理赔工单是否可以申述", notes = "传入aftersalesWorkOrder")
 	@XxlJob("modifyClaimStatus")
-//	@Scheduled(cron = "0 0/1 * * * ?")
+	@Scheduled(cron = "0 0/1 * * * ?")
 	public void updateModifyClaimStatus() {
 		log.info("修改理赔工单是否可以申述>>>>>>>>");
 		  aftersalesWorkOrderService.updateModifyClaimStatus();

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

@@ -83,5 +83,5 @@ public interface AftersalesWorkOrderMapper extends BaseMapper<AftersalesWorkOrde
 	 * 查询是否可以申述
 	 * @return
 	 */
-	List<AftersalesSettlementEntity> getWholeListSettlement();
+	List<AftersalesSettlementEntity> getWholeListSettlement(@Param("param") AftersalesSettlementEntity aftersalesSettlementEntity);
 }

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

@@ -146,7 +146,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
                las.work_order_status workOrderStatus,las.over_time overTime,las.business_id businessId
         from logpm_aftersales_settlement   las
         <where>
-            <if test="param.businessId != null  "> and las.business_id = #{ param.businessId }</if>
+            <if test="param.businessId != null and param.businessId != ''"> and las.business_id = #{ param.businessId }</if>
         </where>
     </select>
     <select id="getListSettlement" resultType="com.logpm.aftersales.entity.AftersalesSettlementEntity">

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

@@ -494,7 +494,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			// 获取当前时间
 			LocalDateTime now = LocalDateTime.now();
 			// 获取48小时前的时间
-			LocalDateTime before48Hours = now.minusHours(48);
+			LocalDateTime before48Hours = now.minusHours(DictTimeoutEnum.huifushijian.getValue());
 			// 获取48小时前的时间戳（秒数）
 			long timestamp = before48Hours.toEpochSecond(ZoneOffset.ofHours(8));
 			long l = i.getAssignTime().getTime() / 1000;
@@ -797,6 +797,18 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				});
 				aftersalesWorkOrderVO.setPersonResponsibleVOS(personResponsibleVOList);
 			}
+			//todo 查询完结信息
+			AftersalesCompletionRecordEntity completionRecordEntity= new AftersalesCompletionRecordEntity();
+			AftersalesCompletionRecipientEntity completionRecipientEntity = new AftersalesCompletionRecipientEntity();
+
+			List<AftersalesCompletionRecordEntity> list4 = completionRecordService.list(Wrappers.<AftersalesCompletionRecordEntity>query().lambda()
+				.eq(AftersalesCompletionRecordEntity::getWorkOrderId,aftersalesWorkOrder.getId())
+			);
+			aftersalesWorkOrderVO.setCompletionRecordEntities(list4);
+			List<AftersalesCompletionRecipientEntity> list5 = completionRecipientService.list(Wrappers.<AftersalesCompletionRecipientEntity>query().lambda()
+				.eq(AftersalesCompletionRecipientEntity::getWorkOrderId,aftersalesWorkOrder.getId())
+			);
+			aftersalesWorkOrderVO.setCompletionRecipientEntityList(list5);
 
 		}
 
@@ -1288,13 +1300,39 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	 */
 	@Override
 	public void updateModifyClaimStatus() {
-		List<AftersalesSettlementEntity> settlementEntityList = baseMapper.getWholeListSettlement();
-		if(!settlementEntityList.isEmpty()){
-			settlementEntityList.forEach(i ->{
 
-			});
+		AftersalesSettlementEntity settlementEntity = new AftersalesSettlementEntity();
+		List<AftersalesSettlementEntity> settlementEntityList = baseMapper.getWholeListSettlement(settlementEntity);
+		List<AftersalesSettlementEntity> list = new ArrayList<>();
+		if(!settlementEntityList.isEmpty()){
+			for (AftersalesSettlementEntity i : settlementEntityList) {
+				if(ObjectUtils.isNotNull(i.getOverTime())){
+					// 获取当前时间
+					LocalDateTime now = LocalDateTime.now();
+					// 获取72小时前的时间
+					LocalDateTime beforeHours = now.minusHours(DictTimeoutEnum.huifushijian.getValue());
+					// 获取72小时前的时间戳（秒数）
+					long timestamp = beforeHours.toEpochSecond(ZoneOffset.ofHours(8));
+					long l = i.getOverTime().getTime() / 1000;
+					long l1 = timestamp - l;
+					if (l1 > 0) {
+						//已超时
+						list.add(i);
+					} else {
+						continue;
+					}
+				}
+			}
+		}
+		if(!list.isEmpty()){
+				list.forEach( i ->{
+					//修改数据
+					AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
+					workOrderEntity.setId(i.getLawoId());
+					workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yijeishu.getValue());
+					baseMapper.updateById(workOrderEntity);
+				});
 		}
-
 	}
 
 	/**