pms 日报任务计划工作量 初始化

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskschedule/vo/IotProjectTaskScheduleRespVO.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 项目任务时间表/施工进度 Response VO")
@@ -48,6 +49,21 @@ public class IotProjectTaskScheduleRespVO {
     @ExcelProperty("状态结束时间 实际")
     private LocalDateTime actualEndTime;
 
+    @Schema(description = "计划注气量 方")
+    private BigDecimal planGasInjection;
+
+    @Schema(description = "计划进尺 m")
+    private BigDecimal planFootage;
+
+    @Schema(description = "计划井次(井)")
+    private BigDecimal planWellTrips;
+
+    @Schema(description = "计划层数(层)")
+    private BigDecimal planLayers;
+
+    @Schema(description = "工作量单位(井/层/方/m)")
+    private String workloadUnit;
+
     @Schema(description = "备注", example = "你说的对")
     @ExcelProperty("备注")
     private String remark;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskschedule/vo/IotProjectTaskScheduleSaveReqVO.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttaskschedule.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 项目任务时间表/施工进度新增/修改 Request VO")
@@ -30,6 +31,21 @@ public class IotProjectTaskScheduleSaveReqVO {
     @Schema(description = "状态结束时间")
     private LocalDateTime endTime;
 
+    @Schema(description = "计划注气量 方")
+    private BigDecimal planGasInjection;
+
+    @Schema(description = "计划进尺 m")
+    private BigDecimal planFootage;
+
+    @Schema(description = "计划井次(井)")
+    private BigDecimal planWellTrips;
+
+    @Schema(description = "计划层数(层)")
+    private BigDecimal planLayers;
+
+    @Schema(description = "工作量单位(井/层/方/m)")
+    private String workloadUnit;
+
     @Schema(description = "备注", example = "你说的对")
     private String remark;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttaskschedule/IotProjectTaskScheduleDO.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -60,6 +61,26 @@ public class IotProjectTaskScheduleDO extends BaseDO {
      * 状态结束时间 实际
      */
     private LocalDateTime actualEndTime;
+    /**
+     * 计划注气量 方
+     */
+    private BigDecimal planGasInjection;
+    /**
+     * 计划进尺 m
+     */
+    private BigDecimal planFootage;
+    /**
+     * 计划井次(井)
+     */
+    private BigDecimal planWellTrips;
+    /**
+     * 计划层数(层)
+     */
+    private BigDecimal planLayers;
+    /**
+     * 工作量单位(井/层/方/m)
+     */
+    private String workloadUnit;
     /**
      * 备注
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrddailyreport/IotRdDailyReportServiceImpl.java

@@ -1203,7 +1203,7 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
 
         // 日报涉及到的施工设备id集合
         Set<Long> reportDeviceIds = new HashSet<>();
-        // 日报小到的施工主设备id集合
+        // 日报用到的施工主设备id集合
         List<Long> reportMainDeviceIds = new ArrayList<>();
 
         List<IotRdDailyReportDO> dailyReports = iotRdDailyReportMapper.dailyReports(pageReqVO);