待执行订单添加已读

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -67,7 +67,7 @@ public class WorkerController {
         if (workOrder == null || workOrder.getTruckId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        List<WorkOrderVO> list = workOrderService.findWorkOrderList(workOrder);
+        List<WorkOrderVO> list = workOrderService.findWorkOrderList(userId, workOrder);
         return new Result<>(list);
     }
 

src/main/java/com/aoyang/tms/controller/vo/WorkOrderVO.java

@@ -32,7 +32,6 @@ public class WorkOrderVO extends WorkOrder implements Serializable {
     @ApiModelProperty(value = "已读未读状态,0未读，1已读")
     private Integer readFlag;
 
-
     @ApiModelProperty(value = "车辆状态,已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
     private Integer truckStatus;
 

src/main/java/com/aoyang/tms/service/WorkOrderReadinfoService.java

@@ -1,5 +1,6 @@
 package com.aoyang.tms.service;
 
+import com.aoyang.tms.entity.WorkOrder;
 import com.aoyang.tms.entity.WorkOrderReadinfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface WorkOrderReadinfoService extends IService<WorkOrderReadinfo> {
 
+
+    /**
+     * @Author guoyong
+     * @Description 获取已读数据
+     * @Date  2022/4/23
+     * @Param
+     * @return
+    **/
+    WorkOrderReadinfo  findWorkOrderReadinfo(Long userId, Long orderId);
+
 }

src/main/java/com/aoyang/tms/service/WorkOrderService.java

@@ -31,10 +31,10 @@ public interface WorkOrderService extends IService<WorkOrder> {
      * @Author guoyong
      * @Description 根据卡车id获取待执行运单
      * @Date  2022/4/22
-     * @Param  
+     * @Param  userId,当前用户id
      * @return 
     **/
-    List<WorkOrderVO> findWorkOrderList(WorkOrder workOrder);
+    List<WorkOrderVO> findWorkOrderList(Long userId,WorkOrder workOrder);
 
     /**
      * 根据组织id查询运力调度统计汇总信息

src/main/java/com/aoyang/tms/service/impl/WorkOrderReadinfoServiceImpl.java

@@ -3,6 +3,8 @@ package com.aoyang.tms.service.impl;
 import com.aoyang.tms.entity.WorkOrderReadinfo;
 import com.aoyang.tms.mapper.WorkOrderReadinfoMapper;
 import com.aoyang.tms.service.WorkOrderReadinfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -17,4 +19,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class WorkOrderReadinfoServiceImpl extends ServiceImpl<WorkOrderReadinfoMapper, WorkOrderReadinfo> implements WorkOrderReadinfoService {
 
+    @Override
+    public WorkOrderReadinfo findWorkOrderReadinfo(Long userId, Long orderId) {
+        QueryWrapper<WorkOrderReadinfo> queryWrapper = Wrappers.query();
+        queryWrapper.eq("order_id", userId);
+        queryWrapper.eq("user_id", orderId);
+        WorkOrderReadinfo readinfo = this.getOne(queryWrapper);
+        return readinfo;
+    }
 }

src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -55,7 +55,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     private WorkOrderReadinfoService workOrderReadinfoService;
 
     @Override
-    public List<WorkOrderVO> findWorkOrderList(WorkOrder workOrderParam) {
+    public List<WorkOrderVO> findWorkOrderList(Long userId, WorkOrder workOrderParam) {
         QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
         queryWrapper.eq("truck_id", workOrderParam.getTruckId());
         List<Integer> statusList = new ArrayList<>();
@@ -67,6 +67,14 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             for (WorkOrder workOrder : list) {
                 WorkOrderVO vo = new WorkOrderVO();
                 BeanUtils.copyProperties(workOrder, vo);
+                WorkOrderReadinfo workOrderReadinfo = workOrderReadinfoService.findWorkOrderReadinfo(userId, workOrderParam.getId());
+                if (workOrderReadinfo != null) {
+                    vo.setReadFlag(1);
+                }
+                Truck truck = truckService.getById(workOrderParam.getTruckId());
+                if (truck != null) {
+                    vo.setTruckStatus(truck.getTmsStatus());
+                }
             }
         }
         return vos;
@@ -278,7 +286,6 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             }
 
 
-
             listVo.add(workOrderPageListVO);
         }
         workOrderPageListVOIPage.setRecords(listVo);