修改赔款方查询

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

@@ -100,6 +100,6 @@ public class AftersalesCompletionRecipientEntity extends TenantEntity {
 	 * 说明
 	 */
 	@ApiModelProperty(value = "说明")
-	private String explain;
+	private String explains;
 
 }

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

@@ -76,7 +76,7 @@ public class AftersalesCompletionRecordEntity extends TenantEntity {
 	 * 说明
 	 */
 	@ApiModelProperty(value = "说明")
-	private String explain;
+	private String explains;
 	/**
 	 * 财务是否处理 1是 2 否
 	 */

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

@@ -156,7 +156,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
         las.work_order_status workOrderStatus
           from logpm_aftersales_settlement   las
         <where>
-            lap.processing_status = '4' and lap.is_deleted = 0
+            las.processing_status = '4' and las.is_deleted = 0
             <if test="param.businessId != null  "> and las.business_id = #{param.businessId }</if>
             <if test="param.businessName != null and param.businessName != '' "> and las.business_name = #{param.businessName }</if>
             <if test="param.workOrderNumber != null and param.workOrderNumber != '' "> and las.work_order_number = #{param.workOrderNumber }</if>

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

@@ -389,6 +389,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			if(ObjectUtils.isNull(v.getCompletionRecordEntities()) ){
 				throw new ServiceException("赔款方数据不能为空");
 			}
+			AftersalesWorkOrderEntity workOrderEntity1 = baseMapper.selectById(v.getId());
+			if(workOrderEntity1.getWorkOrderStatus().equals(WorkOrderStatusConstant.yiwanjei.getValue())){
+				throw new ServiceException(" 包含已完结的异常工单！");
+			}
 			//添加赔付方信息
 			completionRecordService.saveBatch(v.getCompletionRecordEntities());
 			//添加受款方信息，可以为空
@@ -1003,6 +1007,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			if(byId.getWorkOrderStatus().equals(WorkOrderStatusConstant.yichuli.getValue())){
 				throw new ServiceException("当前异常工单已处理！");
 			}
+			if(byId.getWorkOrderStatus().equals(WorkOrderStatusConstant.yiwanjei.getValue())){
+				throw new ServiceException("当前异常工单已完结！！");
+			}
 			AftersalesProcessingResultsDTO aftersalesProcessingResultsDTO = aftersalesWorkOrder.getAftersalesProcessingResultsDTO();
 			aftersalesProcessingResultsService.ownSaveOrUpdate(aftersalesProcessingResultsDTO);
 			//添加完结数据