chengang 4 năm trước cách đây
mục cha
commit
76dcae9ecb

+ 28 - 22
src/main/java/com/aoyang/tms/service/impl/JxlsExportTestServiceImpl.java

@@ -179,29 +179,35 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
         if (os != null && inputStream != null) {
             Map<String, Object> model = new HashMap<String, Object>();
             model.put("workLogTplVO", workLogTplVO);
-            if (workLogTplVO.getWorkOrderList() != null && workLogTplVO.getWorkOrderList().size() > 0) {
-                model.put("workOrderList", workLogTplVO.getWorkOrderList());
-            }
-            if (workLogTplVO.getTmsGasFeeList() != null && workLogTplVO.getTmsGasFeeList().size() > 0) {
-                model.put("tmsGasFeeList", workLogTplVO.getTmsGasFeeList());
-            }
-
-            if (workLogTplVO.getTmsLineCostList() != null && workLogTplVO.getTmsLineCostList().size() > 0) {
-                model.put("tmsLineCostList", workLogTplVO.getTmsLineCostList());
-            }
-
-            if (workLogTplVO.getTruckRepairInfoList() != null && workLogTplVO.getTruckRepairInfoList().size() > 0) {
-                model.put("truckRepairInfoList", workLogTplVO.getTruckRepairInfoList());
-            }
-
-            if (workLogTplVO.getRestInfoList() != null && workLogTplVO.getRestInfoList().size() > 0) {
-                model.put("restInfoList", workLogTplVO.getRestInfoList());
-            }
-
-            if (workLogTplVO.getTruckCheckInfoList() != null && workLogTplVO.getTruckCheckInfoList().size() > 0) {
-                model.put("truckCheckInfoList", workLogTplVO.getTruckCheckInfoList());
-            }
+//            if (workLogTplVO.getWorkOrderList() != null && workLogTplVO.getWorkOrderList().size() > 0) {
+//                model.put("workOrderList", workLogTplVO.getWorkOrderList());
+//            }
+//            if (workLogTplVO.getTmsGasFeeList() != null && workLogTplVO.getTmsGasFeeList().size() > 0) {
+//                model.put("tmsGasFeeList", workLogTplVO.getTmsGasFeeList());
+//            }
+//
+//            if (workLogTplVO.getTmsLineCostList() != null && workLogTplVO.getTmsLineCostList().size() > 0) {
+//                model.put("tmsLineCostList", workLogTplVO.getTmsLineCostList());
+//            }
+//
+//            if (workLogTplVO.getTruckRepairInfoList() != null && workLogTplVO.getTruckRepairInfoList().size() > 0) {
+//                model.put("truckRepairInfoList", workLogTplVO.getTruckRepairInfoList());
+//            }
+//
+//            if (workLogTplVO.getRestInfoList() != null && workLogTplVO.getRestInfoList().size() > 0) {
+//                model.put("restInfoList", workLogTplVO.getRestInfoList());
+//            }
+//
+//            if (workLogTplVO.getTruckCheckInfoList() != null && workLogTplVO.getTruckCheckInfoList().size() > 0) {
+//                model.put("truckCheckInfoList", workLogTplVO.getTruckCheckInfoList());
+//            }
 
+            model.put("workOrderList", workLogTplVO.getWorkOrderList());
+            model.put("tmsGasFeeList", workLogTplVO.getTmsGasFeeList());
+            model.put("tmsLineCostList", workLogTplVO.getTmsLineCostList());
+            model.put("truckRepairInfoList", workLogTplVO.getTruckRepairInfoList());
+            model.put("restInfoList", workLogTplVO.getRestInfoList());
+            model.put("truckCheckInfoList", workLogTplVO.getTruckCheckInfoList());
 
             model.put("driverOneSignUrl", driverOneSignUrl);
             model.put("driverTwoSignUrl", driverTwoSignUrl);