Merge branch 'dailyReport'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportPageReqVO.java

@@ -89,6 +89,9 @@ public class IotRyDailyReportPageReqVO extends PageParam {
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "1")
     private String rigStatus;
 
+    @Schema(description = "瑞鹰 修井 施工状态(动迁 准备 施工 完工)", example = "1")
+    private String repairStatus;
+
     @Schema(description = "人员情况")
     private String personnel;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportRespVO.java

@@ -142,6 +142,10 @@ public class IotRyDailyReportRespVO {
     @ExcelProperty("施工状态(动迁 准备 施工 完工)")
     private String rigStatus;
 
+    @Schema(description = "瑞鹰修井 施工状态(动迁 准备 施工 完工)", example = "1")
+    @ExcelProperty("瑞鹰修井 施工状态(动迁 准备 施工 完工)")
+    private String repairStatus;
+
     @Schema(description = "人员情况")
     @ExcelProperty("人员情况")
     private String personnel;
@@ -247,4 +251,6 @@ public class IotRyDailyReportRespVO {
     @Schema(description = "井别", example = "气井")
     private String wellCategory;
 
+    @Schema(description = "在岗人数 = 全员数量-休假人员数量", example = "80")
+    private BigDecimal onDutyStaffNum;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportSaveReqVO.java

@@ -105,6 +105,9 @@ public class IotRyDailyReportSaveReqVO {
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "1")
     private String rigStatus;
 
+    @Schema(description = "瑞鹰 修井 施工状态(动迁 准备 施工 完工)", example = "1")
+    private String repairStatus;
+
     @Schema(description = "人员情况")
     private String personnel;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotrydailyreport/IotRyDailyReportDO.java

@@ -163,6 +163,10 @@ public class IotRyDailyReportDO extends BaseDO {
      * 施工状态(动迁 准备 施工 完工)
      */
     private String rigStatus;
+    /**
+     * 瑞鹰修井 施工状态(动迁 准备 施工 完工)
+     */
+    private String repairStatus;
     /**
      * 人员情况
      */