修改异常工单数据

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

@@ -118,7 +118,7 @@ public class AftersalesExchangeController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入aftersalesExchange")
 	public R submit(@Valid @RequestBody AftersalesExchangeEntity aftersalesExchange) {
-		return R.status(aftersalesExchangeService.saveOrUpdate(aftersalesExchange));
+		return R.status(aftersalesExchangeService.ownSaveOrUpdate(aftersalesExchange));
 	}
 
 	/**

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

@@ -125,6 +125,20 @@ public class AftersalesWorkOrderController extends BladeController {
 		return R.status(aftersalesWorkOrderService.saveOrUpdateOwn(aftersalesWorkOrder));
 	}
 
+
+
+	/**
+	 * 客服异常工单 仓库查询待处理的异常工单
+	 */
+	@GetMapping("/pendingWorkOrder")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "仓库查询待处理的异常工单", notes = "传入aftersalesWorkOrder")
+	public R getPendingWorkOrder(AftersalesWorkOrderDTO aftersalesWorkOrder,Query query) {
+		log.info("工单创建的数据{}",aftersalesWorkOrder.toString());
+		IPage<AftersalesWorkOrderVO> list= aftersalesWorkOrderService.getPendingWorkOrder(aftersalesWorkOrder,Condition.getPage(query));
+		return R.data(list);
+	}
+
 	/**
 	 * 客服异常工单 删除
 	 */

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.aftersales.mapper;
 
+import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
 import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
 import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
@@ -51,4 +52,11 @@ public interface AftersalesWorkOrderMapper extends BaseMapper<AftersalesWorkOrde
 	 */
 	List<AftersalesWorkOrderExcel> exportAftersalesWorkOrder(@Param("ew") Wrapper<AftersalesWorkOrderEntity> queryWrapper);
 
+	/**
+	 * 查询待处理的异常工单数据
+	 * @param page
+	 * @param aftersalesWorkOrder
+	 * @return
+	 */
+    IPage<AftersalesWorkOrderVO> getPendingWorkOrder(IPage<Object> page,@Param("param") AftersalesWorkOrderDTO aftersalesWorkOrder);
 }

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

@@ -60,4 +60,19 @@
         SELECT * FROM logpm_aftersales_work_order ${ew.customSqlSegment}
     </select>
 
+    <select id="getPendingWorkOrder" resultType="com.logpm.aftersales.vo.AftersalesWorkOrderVO">
+        select  law.id,law.work_order_type, law.initiation_identification,law.discovery_node,law.work_order_number,law.waybill_number,law.order_code, law.train_number, law.first,
+        law.secondary, law.vehicle_route,law.deliver_goods_time, law.discovery_time, law.warehousing_time, law.waybill_mall,law.remarks, law.delivery_time,law.delivery_driver
+        ,law.work_order_status, law.customer_service_id, law.customer_service_name,law.waybill_mall_id,law.over_time, law.problem_description,law.warehouse_id, law.person_responsible,
+        law.process_number, law.reviewed_by, law.audit_time, law.entry_time, law.operator
+        from logpm_aftersales_processor lap
+        LEFT JOIN logpm_aftersales_work_order law on lap.business_id = law.id
+        <where>
+            lap.conditions != '3' and lap.is_deleted = 0
+            <if test="param.workOrderStatus != null and param.workOrderStatus != ''">and  law.work_order_status = #{param.work_order_status}</if>
+            <if test="param.warehouseId != null and param.warehouseId != ''">and  law.warehouse_id = #{param.warehouseId}</if>
+        </where>
+
+    </select>
+
 </mapper>

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

@@ -49,4 +49,10 @@ public interface IAftersalesExchangeService extends BaseService<AftersalesExchan
 	 */
 	List<AftersalesExchangeExcel> exportAftersalesExchange(Wrapper<AftersalesExchangeEntity> queryWrapper);
 
+	/**
+	 * 添加或修改聊天记录
+	 * @param aftersalesExchange
+	 * @return
+	 */
+    boolean ownSaveOrUpdate(AftersalesExchangeEntity aftersalesExchange);
 }

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

@@ -56,4 +56,12 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @return
 	 */
 	boolean saveOrUpdateOwn(AftersalesWorkOrderDTO aftersalesWorkOrder);
+
+	/**
+	 * 查询待处理的异常工单数据
+	 * @param aftersalesWorkOrder
+	 * @param page
+	 * @return
+	 */
+	IPage<AftersalesWorkOrderVO> getPendingWorkOrder(AftersalesWorkOrderDTO aftersalesWorkOrder, IPage<Object> page);
 }

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

@@ -139,6 +139,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 					AftersalesProcessorEntity packageEntity = new AftersalesProcessorEntity();
 					BeanUtil.copyProperties(i,packageEntity);
 					packageEntity.setWorkOrderId(aftersalesWorkOrder.getId());
+					packageEntity.setConditions("1");//正常
 					packageEntity.setWarehouseId(myCurrentWarehouse.getId());
 					list.add(packageEntity);
 				});
@@ -151,8 +152,26 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		}else{
 			//修改
 
+
+
+
+
+
 			return baseMapper.updateById(aftersalesWorkOrder) > 0 ? true : false;
 		}
 	}
 
+	/**
+	 * 查询待处理的异常工单数据
+	 * @param aftersalesWorkOrder
+	 * @param page
+	 * @return
+	 */
+	@Override
+	public IPage<AftersalesWorkOrderVO> getPendingWorkOrder(AftersalesWorkOrderDTO aftersalesWorkOrder, IPage<Object> page) {
+
+		IPage<AftersalesWorkOrderVO> list = baseMapper.getPendingWorkOrder(page,aftersalesWorkOrder);
+		return list;
+	}
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -1070,7 +1070,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			throw new ServiceException("请选择仓库！！");
 		}
 		BladeUser user = AuthUtil.getUser();
-		if(ObjectUtils.isNull(questDetailDTO)){
+		if(ObjectUtils.isNotNull(questDetailDTO)){
 			questDetailDTO.stream().forEach( i ->{
 				if(i.getStockNum() > 0 || i.getWornNum() > 0 || i.getLossNum() > 0 || i.getNoRepairNum() > 0 || i.getDeliveNum() > 0 || i.getNoReceivedNum()> 0){
 					//添加
@@ -1097,7 +1097,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				List<QuestDetailEntity> list = new ArrayList<>();
 				QuestDetailEntity questDetail = new QuestDetailEntity();
 				questDetail.setId(i.getId());
-				questDetail.setQuestStatus(i.getQuestStatus());
+				questDetail.setQuestStatus(1);
 				questDetail.setUpdateUser(user.getUserId());
 				questDetail.setUpdateTime(new Date());
 				if(ObjectUtils.isNotNull(i.getOrderCode())){