LY 工作票导出

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -67,6 +67,7 @@ public class TJobticketController extends BaseController
     {
         startPage();
         List<TJobticket> list = tJobticketService.selectTJobticketList(tJobticket);
+        //查询续票
         for (TJobticket t: list
              ) {
             List<TJobticket> cList = tJobticketMapper.selectTJobticketChildren(t);
@@ -108,8 +109,18 @@ public class TJobticketController extends BaseController
     public AjaxResult export(TJobticket tJobticket)
     {
         List<TJobticket> list = tJobticketService.selectTJobticketList(tJobticket);
+        List<TJobticket> exportList = new ArrayList<>();
+        //查询续票
+        for (TJobticket t: list
+        ) {
+            exportList.add(t);
+            List<TJobticket> cList = tJobticketMapper.selectTJobticketChildren(t);
+            if (cList.size() > 0) {
+                exportList.addAll(cList);
+            }
+        }
         ExcelUtil<TJobticket> util = new ExcelUtil<TJobticket>(TJobticket.class);
-        return util.exportExcel(list, "jobticket");
+        return util.exportExcel(exportList, "jobticket");
     }
 
     /**