Merge remote-tracking branch 'origin/master'

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

@@ -51,12 +51,13 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
         WorkLogTplVO workLogTplVO = new WorkLogTplVO();
 
         WorkCycle workCycle = workCycleService.getById(param.getCycleId());
+        param.setTruckId(workCycle.getTruckId());
         workLogTplVO.setWorkCycle(workCycle);
-        workLogTplVO.setBetweenTime(DateUtils.betweenTime(workCycle.getStartTime(),workCycle.getEndTime()));
+        workLogTplVO.setBetweenTime(DateUtils.betweenTime(workCycle.getStartTime(), workCycle.getEndTime()));
         int year = DateUtils.getCurrentYear(workCycle.getCreateDate());
         int month = DateUtils.getCurrentMonths(workCycle.getCreateDate());
         int day = DateUtils.getCurrentDay(workCycle.getCreateDate());
-        workLogTplVO.setLogDate(year+" 年"+month+" 月"+day+" 日");
+        workLogTplVO.setLogDate(year + " 年" + month + " 月" + day + " 日");
         //根据行程周期获取运单列表，按时间正序，第一单为装单，接下来为顺序卸单
         QueryWrapper<WorkOrder> workOrderQueryWrapper = new QueryWrapper<WorkOrder>();
         if (param.getCycleId() != null) {
@@ -68,7 +69,7 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
         int listSize = workOrderList.size();
         for (int i = 0; i < listSize; i++) {
             WorkOrder workOrderParam = workOrderList.get(i);
-            workOrderParam.setBetweenTime(DateUtils.betweenTime(workOrderParam.getActualReachTime(),workOrderParam.getActualLeaveTime()));
+            workOrderParam.setBetweenTime(DateUtils.betweenTime(workOrderParam.getActualReachTime(), workOrderParam.getActualLeaveTime()));
             workOrders.add(workOrderParam);
         }
         workLogTplVO.setWorkOrderList(workOrders);
@@ -147,6 +148,10 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
     public StreamingResponseBody download(WorkOrder param, HttpServletResponse response) throws IOException {
 
         WorkLogTplVO workLogTplVO = getWorkLogTplVO(param);
+        if (workLogTplVO == null) {
+            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());