workOrder分页查询

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

@@ -163,9 +163,9 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
             log.info("workLogTplVO is null:{}");
             return null;
         }
-        byte driverOneSignUrl[] = getImageBytes(workLogTplVO.getWorkCycle().getDriverOneSignUrl());
-        byte driverTwoSignUrl[] = getImageBytes(workLogTplVO.getWorkCycle().getDriverTwoSignUrl());
-        byte escortSignUrl[] = getImageBytes(workLogTplVO.getWorkCycle().getEscortSignUrl());
+        byte driverOneSignUrl[] = getImageBytes("https://dwx.auyen.com/" + workLogTplVO.getWorkCycle().getDriverOneSignUrl());
+        byte driverTwoSignUrl[] = getImageBytes("https://dwx.auyen.com/" + workLogTplVO.getWorkCycle().getDriverTwoSignUrl());
+        byte escortSignUrl[] = getImageBytes("https://dwx.auyen.com/" + workLogTplVO.getWorkCycle().getEscortSignUrl());
 
         // 获取模板文件
         String tplfileName = "work_log_tpl.xlsx";

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

@@ -277,6 +277,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         if (workOrderParam.getTrailerNumber() != null) {
             queryWrapper.like("trailer_number", workOrderParam.getTrailerNumber());
         }
+        if (workOrderParam.getOrderStatus() != null) {
+            queryWrapper.eq("order_status", workOrderParam.getOrderStatus());
+        }
 
         if (workOrderParam.getShipperName() != null) {
             queryWrapper.like("shipper_name", workOrderParam.getShipperName());