Эх сурвалжийг харах

refactor(national-motion-system):调整订单时间格式并增加场地时间字段

- 将 AppOrderInfoDTO 中的 startTime 和 endTime 字段格式从 HH:mm:ss 修改为 HH:mm
- 在 OrderServiceImpl 中为 appOrderInfoDTO增加 startTime 和 endTime 字段赋值
wzq 1 сар өмнө
parent
commit
54da2b44da

+ 4 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AppOrderInfoDTO.java

@@ -76,14 +76,14 @@ public class AppOrderInfoDTO implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date dateOfSale;
 
-    @Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    @Excel(name = "开始时间", width = 20, format = "HH:mm")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
 
-    @Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    @Excel(name = "结束时间", width = 20, format = "HH:mm")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

+ 2 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -1454,6 +1454,8 @@ public class OrderServiceImpl implements IOrderService {
             AppSite site = appSiteMapper.selectById(appCourses.getSiteId());
             appOrderInfoDTO.setSiteName(site.getName());
             appOrderInfoDTO.setRunStatus(site.getRunStatus());
+            appOrderInfoDTO.setStartTime(site.getStartTime());
+            appOrderInfoDTO.setEndTime(site.getEndTime());
             //上课地点(经纬度)
             AppSite courseSite = appSiteMapper.selectById(appCourses.getAddressSiteId());
             appOrderInfoDTO.setOrSchoolCourse(0);