pms 瑞都 瑞鹰 生产动态明细 开始结束时间添加年月日时分秒

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrddailyreportdetail/vo/IotRdDailyReportDetailRespVO.java

@@ -46,6 +46,14 @@ public class IotRdDailyReportDetailRespVO {
     @ExcelProperty("结束时间段")
     private LocalTime endTime;
 
+    @Schema(description = "日报明细 开始日期时间")
+    @ExcelProperty("开始时间")
+    private LocalDateTime startDateTime;
+
+    @Schema(description = "日报明细 结束日期时间")
+    @ExcelProperty("结束时间")
+    private LocalDateTime endDateTime;
+
     @Schema(description = "时长(H)")
     @ExcelProperty("时长(H)")
     private BigDecimal duration;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrddailyreportdetail/vo/IotRdDailyReportDetailSaveReqVO.java

@@ -34,6 +34,12 @@ public class IotRdDailyReportDetailSaveReqVO {
     @Schema(description = "结束时间段")
     private String endTime;
 
+    @Schema(description = "日报明细 开始日期时间")
+    private LocalDateTime startDateTime;
+
+    @Schema(description = "日报明细 结束日期时间")
+    private LocalDateTime endDateTime;
+
     @Schema(description = "时长(H)")
     private BigDecimal duration;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreportdetail/vo/IotRyDailyReportDetailRespVO.java

@@ -46,6 +46,14 @@ public class IotRyDailyReportDetailRespVO {
     @ExcelProperty("结束时间段")
     private LocalTime endTime;
 
+    @Schema(description = "日报明细 开始日期时间")
+    @ExcelProperty("开始时间")
+    private LocalDateTime startDateTime;
+
+    @Schema(description = "日报明细 结束日期时间")
+    @ExcelProperty("结束时间")
+    private LocalDateTime endDateTime;
+
     @Schema(description = "时长(H)")
     @ExcelProperty("时长(H)")
     private BigDecimal duration;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreportdetail/vo/IotRyDailyReportDetailSaveReqVO.java

@@ -34,6 +34,12 @@ public class IotRyDailyReportDetailSaveReqVO {
     @Schema(description = "结束时间段")
     private String endTime;
 
+    @Schema(description = "日报明细 开始日期时间")
+    private LocalDateTime startDateTime;
+
+    @Schema(description = "日报明细 结束日期时间")
+    private LocalDateTime endDateTime;
+
     @Schema(description = "时长(H)")
     private BigDecimal duration;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotrddailyreportdetail/IotRdDailyReportDetailDO.java

@@ -58,6 +58,14 @@ public class IotRdDailyReportDetailDO extends BaseDO {
      * 结束时间段
      */
     private LocalTime endTime;
+    /**
+     * 开始日期时间
+     */
+    private LocalDateTime startDateTime;
+    /**
+     * 结束日期时间
+     */
+    private LocalDateTime endDateTime;
     /**
      * 时长(H)
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotrydailyreportdetail/IotRyDailyReportDetailDO.java

@@ -58,6 +58,14 @@ public class IotRyDailyReportDetailDO extends BaseDO {
      * 结束时间段
      */
     private LocalTime endTime;
+    /**
+     * 开始日期时间
+     */
+    private LocalDateTime startDateTime;
+    /**
+     * 结束日期时间
+     */
+    private LocalDateTime endDateTime;
     /**
      * 时长(H)
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrydailyreport/IotRyDailyReportServiceImpl.java

@@ -278,7 +278,12 @@ public class IotRyDailyReportServiceImpl implements IotRyDailyReportService {
                 tempDetail.setDeptId(iotRyDailyReport.getDeptId());
                 tempDetail.setTaskId(iotRyDailyReport.getTaskId());
                 tempDetail.setReportId(iotRyDailyReport.getId());
-                tempDetail.setReportDate(detail.getReportDate());
+                if (ObjUtil.isNotEmpty(detail.getReportDate())) {
+                    tempDetail.setReportDate(detail.getReportDate());
+                }
+                if (ObjUtil.isNotEmpty(detail.getStartDateTime())) {
+                    tempDetail.setReportDate(detail.getStartDateTime());
+                }
                 reportDOs.add(tempDetail);
             });
             // 插入日报明细记录