修改工单申述修改工单

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

@@ -267,7 +267,6 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
 	 * 仲裁原因
 	 */
 	@ApiModelProperty(value = "仲裁原因")
-	@TableField(exist = false)
 	private String  reasonArbitration;
 
 	/**

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

@@ -177,6 +177,9 @@ public class AftersalesAppealController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		if(ObjectUtils.isNull(ids)){
+			throw new ServiceException("ids 参数不能为空！！");
+		}
 		return R.status(aftersalesAppealService.deleteLogic(Func.toLongList(ids)));
 	}
 

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

@@ -57,5 +57,10 @@ public class AftersalesAppealDTO extends AftersalesAppealEntity {
 	 * 发现节点
 	 */
 	private String discoveryNode;
+	/**
+	 * 标识 1 仓库  2 总部客服
+	 */
+	private String identifying;
+
 
 }

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

@@ -55,9 +55,8 @@
         logpm_aftersales_appeal laa
         LEFT JOIN logpm_aftersales_completion_record lacr on laa.work_order_id = lacr.work_order_id
         LEFT JOIN logpm_aftersales_work_order lawo ON lawo.id = lacr.work_order_id
-        <where>
+        <where> laa.is_deleted = 0
             <if test="param.warehouseId != null and param.warehouseId != '' "> and lacr.warehouse_id = #{param.warehouseId }  </if>
-
             <if test="param.appealPeopleName != null and param.appealPeopleName != ''">and laa.appeal_people_name  = #{param.appealPeopleName}</if>
             <if test="param.claimant != null and param.claimant != ''">and laa.claimant = #{param.claimant}</if>
             <if test="param.workOrderNumber != null and param.workOrderNumber != ''">and lawo.work_order_number  = #{param.workOrderNumber}</if>
@@ -66,7 +65,10 @@
             <if test="param.workOrderType != null and param.workOrderType != ''">and lawo.work_order_type = #{param.workOrderType}</if>
             <if test="param.discoveryNode != null and param.discoveryNode != ''">and lawo.discovery_node = #{param.discoveryNode}</if>
             <if test="param.typesOf != null and param.typesOf != ''">and laa.types_of = #{param.typesOf}</if>
+            <if test="param.identifying != null and param.identifying == 1 "> and laa.types_of in ('0','1','2','3') </if>
+            <if test="param.identifying != null and param.identifying == 2 "> and laa.types_of in ('0','1','2') </if>
         </where>
+        Order by laa.create_time desc
     </select>
 
 </mapper>

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

@@ -101,10 +101,13 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
                      and  lawo.work_order_status IN ( '10', '20', '21', '30', '40', '50', '60', '70', '80', '90' ,'100','110')
             </if>
             <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30) and lap.processing_status = '4'  and lap.business_id = #{param.warehouseId} </if>
-            <if test="param.handleStatus!= null and param.handleStatus == 20 ">or lawo.work_order_status in (80,100) and  lap.processing_status = '4'  and lap.business_id = #{param.warehouseId} </if>
-            <if test="param.handleStatus!= null and param.handleStatus == 10 ">and  lawo.warehouse_id = #{param.warehouseId} or lap.types_of = '2'  and lap.business_id = #{param.warehouseId} </if>
-            <if test="param.workOrderStatus != null and param.workOrderStatus != '' and param.customerServiceState == null ">and  lawo.work_order_status in( #{param.workOrderStatus }) or lap.types_of = '2'  and lap.business_id = #{param.warehouseId}   </if>
-
+            <if test="param.handleStatus!= null and param.handleStatus == 10 ">and  lawo.warehouse_id = #{param.warehouseId}  </if>
+            <if test="param.workOrderStatus != null and param.workOrderStatus != '' and param.customerServiceState == null ">and  lawo.work_order_status in( #{param.workOrderStatus })    </if>
+            or 1 = 1
+            <if test="param.workOrderStatus != null and param.workOrderStatus != '' and param.customerServiceState == null "> and  lawo.work_order_status in ( #{param.workOrderStatus }) and lap.types_of = '2'  and lap.business_id = #{param.warehouseId}   </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 10 ">and   lap.types_of = '2'  and lap.business_id = #{param.warehouseId} </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30) and lap.processing_status = '4'  and lap.business_id = #{param.warehouseId} </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100) and  lap.processing_status = '4'  and lap.business_id = #{param.warehouseId} </if>
             ORDER BY lawo.create_time DESC
         </where>
 

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

@@ -1618,11 +1618,17 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	@Override
 	public boolean updateCompletionEnd(AftersalesWorkOrderDTO aftersalesWorkOrder) {
 		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getTypesOf()) && "1".equals(aftersalesWorkOrder.getTypesOf())){
-			//修改申述成立
-			AftersalesAppealEntity aftersalesAppealEntity = new AftersalesAppealEntity();
-			aftersalesAppealEntity.setId(aftersalesWorkOrder.getAppealId());
-			aftersalesAppealEntity.setTypesOf("1");
-			aftersalesAppealService.updateById(aftersalesAppealEntity);
+			//查询是否已处理
+			AftersalesAppealEntity aftersalesAppealEntity1 = aftersalesAppealService.selectById(aftersalesWorkOrder.getAppealId());
+			if("0".equals(aftersalesAppealEntity1.getTypesOf())){
+				//修改申述成立
+				AftersalesAppealEntity aftersalesAppealEntity = new AftersalesAppealEntity();
+				aftersalesAppealEntity.setId(aftersalesWorkOrder.getAppealId());
+				aftersalesAppealEntity.setTypesOf("1");
+				aftersalesAppealService.updateById(aftersalesAppealEntity);
+			}else{
+			 	throw new ServiceException("已处理！");
+			}
 		}
 
 		//异常工单完结处理结果赔款方
@@ -1632,7 +1638,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				.eq(AftersalesCompletionRecordEntity::getWorkOrderId, aftersalesWorkOrder.getId())
 			);
 			List<Long> collect = list.stream().map(AftersalesCompletionRecordEntity::getId).collect(Collectors.toList());
-			completionRecordService.deleteLogic(collect);
+			if(!collect.isEmpty()){
+				completionRecordService.deleteLogic(collect);
+			}
 			completionRecordService.saveBatch(aftersalesWorkOrder.getCompletionRecordEntities());
 		}
 		//异常工单完结处理结果受款方
@@ -1641,11 +1649,26 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				.eq(AftersalesCompletionRecipientEntity::getWorkOrderId, aftersalesWorkOrder.getId())
 			);
 			List<Long> collect = list.stream().map(AftersalesCompletionRecipientEntity::getId).collect(Collectors.toList());
-			completionRecipientService.deleteLogic(collect);
+			if(!collect.isEmpty()){
+				completionRecipientService.deleteLogic(collect);
+			}
 			completionRecipientService.saveBatch(aftersalesWorkOrder.getCompletionRecipientEntities());
+		}
+		AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getReasonArbitration())){
+
+			workOrderEntity.setId(aftersalesWorkOrder.getId());
+			workOrderEntity.setReasonArbitration(aftersalesWorkOrder.getReasonArbitration());
 
 		}
-		return true;
+		//修改工单状态
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getTypesOf())){
+			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yiwanjei.getValue());
+			return baseMapper.updateById(workOrderEntity) > 0;
+		} else {
+			return true;
+		}
+
 	}
 
 	/**