省际度假游轮经营情况日报表，返回游轮ID，航次ID

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/report/vo/CruiseOpsDailyRespVO.java

@@ -36,6 +36,7 @@ public class CruiseOpsDailyRespVO {
     @ExcelProperty("船舶")
     private String ship;
 
+
     @Schema(description = "航线", example = "重庆-宜昌")
     @ExcelProperty("航线")
     private String route;
@@ -152,4 +153,8 @@ public class CruiseOpsDailyRespVO {
     @ExcelProperty("是否累计")
     private Boolean isCumulative;
 
+
+
+    private String shipId;
+    private String voyageId;
 }

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/report/OpsDailyMapper.xml

@@ -10,7 +10,9 @@
         DATE_FORMAT(v.boarding_time, '%Y-%m') AS `month`,
         DATE_FORMAT(v.boarding_time, '%Y-%m-%d') AS `date`,
         s.name AS ship,
+        s.id AS shipId,
         r.name AS route,
+        v.id AS voyageId,
         v.name AS voyageNo,
         528 AS passengerCapacity,
         COALESCE(sum(tv.passengerCount), 0) AS passengerCount,