添加预定名单数

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -350,6 +350,7 @@ public class OtcTradeOrderController {
                 // 7.4 填充订单汇总数据和人员统计描述（格式：X大Y小）
                 MapUtils.findAndThen(orderTotalVoMap, item.getId(), totalVO -> {
                     item.setSummary(totalVO);
+                    item.setPersonCount(totalVO.getAdultTotalNum()+totalVO.getBabyTotalNum()+totalVO.getChildTotalNum()+totalVO.getWithTotalNum()+totalVO.getLeaderTotalNum());
                     item.setPersonStat(totalVO.getAdultTotalNum() + "大" + (totalVO.getChildTotalNum() + totalVO.getBabyTotalNum()) + "小");
                 });
                 // 7.5 填充航次信息

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderRespNewVO.java

@@ -77,10 +77,14 @@ public class TradeOrderRespNewVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = FORMAT_YEAR_MONTH_DAY, timezone = TIME_ZONE_DEFAULT)
     private Date travelDate;
 
-    @Schema(description = "总人数")
-    @ExcelProperty("人数")
+    @Schema(description = "录入名单数")
+    @ExcelProperty("录入名单数")
     private Integer totalPerson;
 
+    @Schema(description = "预定名单数")
+    @ExcelProperty("预定名单数")
+    private Integer personCount;
+
     @Schema(description = "备注")
     @ExcelProperty("备注")
     private String remark;
@@ -98,6 +102,7 @@ public class TradeOrderRespNewVO {
     @Schema(description = "人员数据统计")
     private String personStat;
 
+
     @Schema(description = "订单汇总信息")
     private TradeOrderTotalVO summary;