Просмотр исходного кода

fix: 处理航线修改报错问题

luofeiyun 2 дней назад
Родитель
Сommit
3f8c42ff60

+ 6 - 3
ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/route/vo/ResourceRouteRespVO.java

@@ -1,5 +1,8 @@
 package com.yc.ship.module.resource.controller.admin.route.vo;
 package com.yc.ship.module.resource.controller.admin.route.vo;
 
 
+import com.yc.ship.module.resource.controller.admin.routecost.vo.ResourceRouteCostRespVO;
+import com.yc.ship.module.resource.controller.admin.routelight.vo.ResourceRouteLightRespVO;
+import com.yc.ship.module.resource.controller.admin.routetrip.vo.ResourceRouteTripRespVO;
 import com.yc.ship.module.resource.dal.dataobject.routecost.ResourceRouteCostDO;
 import com.yc.ship.module.resource.dal.dataobject.routecost.ResourceRouteCostDO;
 import com.yc.ship.module.resource.dal.dataobject.routelight.ResourceRouteLightDO;
 import com.yc.ship.module.resource.dal.dataobject.routelight.ResourceRouteLightDO;
 import com.yc.ship.module.resource.dal.dataobject.routetrip.ResourceRouteTripDO;
 import com.yc.ship.module.resource.dal.dataobject.routetrip.ResourceRouteTripDO;
@@ -133,13 +136,13 @@ public class ResourceRouteRespVO {
     private String routeTheme;
     private String routeTheme;
 
 
     @Schema(description = "航线亮点")
     @Schema(description = "航线亮点")
-    private List<ResourceRouteLightDO> routeLights;
+    private List<ResourceRouteLightRespVO> routeLights;
 
 
     @Schema(description = "航线费用包含")
     @Schema(description = "航线费用包含")
-    private List<ResourceRouteCostDO> routeCosts;
+    private List<ResourceRouteCostRespVO> routeCosts;
 
 
     @Schema(description = "航线行程")
     @Schema(description = "航线行程")
-    private List<ResourceRouteTripDO> routeTrips;
+    private List<ResourceRouteTripRespVO> routeTrips;
 
 
 
 
 }
 }

+ 0 - 4
ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/routecost/vo/ResourceRouteCostRespVO.java

@@ -14,10 +14,6 @@ import com.yc.ship.framework.excel.core.convert.DictConvert;
 @ExcelIgnoreUnannotated
 @ExcelIgnoreUnannotated
 public class ResourceRouteCostRespVO {
 public class ResourceRouteCostRespVO {
 
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21348")
-    @ExcelProperty("ID")
-    private Long id;
-
     @Schema(description = "航线ID", example = "11291")
     @Schema(description = "航线ID", example = "11291")
     @ExcelProperty("航线ID")
     @ExcelProperty("航线ID")
     private Long routeId;
     private Long routeId;

+ 0 - 4
ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/routelight/vo/ResourceRouteLightRespVO.java

@@ -14,10 +14,6 @@ import com.yc.ship.framework.excel.core.convert.DictConvert;
 @ExcelIgnoreUnannotated
 @ExcelIgnoreUnannotated
 public class ResourceRouteLightRespVO {
 public class ResourceRouteLightRespVO {
 
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26656")
-    @ExcelProperty("ID")
-    private Long id;
-
     @Schema(description = "图标")
     @Schema(description = "图标")
     @ExcelProperty("图标")
     @ExcelProperty("图标")
     private String icon;
     private String icon;

+ 9 - 4
ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/routetrip/vo/ResourceRouteTripRespVO.java

@@ -1,5 +1,8 @@
 package com.yc.ship.module.resource.controller.admin.routetrip.vo;
 package com.yc.ship.module.resource.controller.admin.routetrip.vo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yc.ship.module.resource.controller.admin.routetripdetail.vo.ResourceRouteTripDetailRespVO;
+import com.yc.ship.module.resource.dal.dataobject.routetripdetail.ResourceRouteTripDetailDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.*;
 import java.util.*;
 import java.util.*;
@@ -14,10 +17,6 @@ import com.yc.ship.framework.excel.core.convert.DictConvert;
 @ExcelIgnoreUnannotated
 @ExcelIgnoreUnannotated
 public class ResourceRouteTripRespVO {
 public class ResourceRouteTripRespVO {
 
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9178")
-    @ExcelProperty("ID")
-    private Long id;
-
     @Schema(description = "航线ID", example = "750")
     @Schema(description = "航线ID", example = "750")
     @ExcelProperty("航线ID")
     @ExcelProperty("航线ID")
     private Long routeId;
     private Long routeId;
@@ -39,4 +38,10 @@ public class ResourceRouteTripRespVO {
     @ExcelProperty("创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
     private LocalDateTime createTime;
 
 
+    /**
+     * 行程详细
+     */
+    @Schema(description = "行程详细")
+    private List<ResourceRouteTripDetailRespVO> routeTripDetails;
+
 }
 }

+ 4 - 5
ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/routetripdetail/vo/ResourceRouteTripDetailRespVO.java

@@ -14,10 +14,6 @@ import com.yc.ship.framework.excel.core.convert.DictConvert;
 @ExcelIgnoreUnannotated
 @ExcelIgnoreUnannotated
 public class ResourceRouteTripDetailRespVO {
 public class ResourceRouteTripDetailRespVO {
 
 
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32233")
-    @ExcelProperty("ID")
-    private Long id;
-
     @Schema(description = "航线ID", example = "16772")
     @Schema(description = "航线ID", example = "16772")
     @ExcelProperty("航线ID")
     @ExcelProperty("航线ID")
     private Long routeId;
     private Long routeId;
@@ -26,13 +22,16 @@ public class ResourceRouteTripDetailRespVO {
     @ExcelProperty("行程ID")
     @ExcelProperty("行程ID")
     private Long tripId;
     private Long tripId;
 
 
+    @Schema(description = "标题", example = "张三")
+    private String title;
+
     @Schema(description = "开始时间")
     @Schema(description = "开始时间")
     @ExcelProperty("开始时间")
     @ExcelProperty("开始时间")
     private String startTime;
     private String startTime;
 
 
     @Schema(description = "结束时间")
     @Schema(description = "结束时间")
     @ExcelProperty("结束时间")
     @ExcelProperty("结束时间")
-    private String emdTime;
+    private String endTime;
 
 
     @Schema(description = "内容")
     @Schema(description = "内容")
     @ExcelProperty("内容")
     @ExcelProperty("内容")