Merge branch 'dailyReport'

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

@@ -92,6 +92,12 @@ public class IotRyDailyReportPageReqVO extends PageParam {
     @Schema(description = "人员情况")
     private String personnel;
 
+    @Schema(description = "全员数量")
+    private BigDecimal totalStaffNum;
+
+    @Schema(description = "休假人员数量")
+    private BigDecimal leaveStaffNum;
+
     @Schema(description = "泥浆性能-密度(g/cm³)")
     private BigDecimal mudDensity;
 

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

@@ -146,6 +146,14 @@ public class IotRyDailyReportRespVO {
     @ExcelProperty("人员情况")
     private String personnel;
 
+    @Schema(description = "全员数量")
+    @ExcelProperty("全员数量")
+    private BigDecimal totalStaffNum;
+
+    @Schema(description = "休假人员数量")
+    @ExcelProperty("休假人员数量")
+    private BigDecimal leaveStaffNum;
+
     @Schema(description = "泥浆性能-密度(g/cm³)")
     @ExcelProperty("泥浆性能-密度(g/cm³)")
     private BigDecimal mudDensity;

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

@@ -108,6 +108,12 @@ public class IotRyDailyReportSaveReqVO {
     @Schema(description = "人员情况")
     private String personnel;
 
+    @Schema(description = "全员数量")
+    private BigDecimal totalStaffNum;
+
+    @Schema(description = "休假人员数量")
+    private BigDecimal leaveStaffNum;
+
     @Schema(description = "泥浆性能-密度(g/cm³)")
     private BigDecimal mudDensity;
 

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

@@ -167,6 +167,14 @@ public class IotRyDailyReportDO extends BaseDO {
      * 人员情况
      */
     private String personnel;
+    /**
+     * 全员数量
+     */
+    private BigDecimal totalStaffNum;
+    /**
+     * 休假人员数量
+     */
+    private BigDecimal leaveStaffNum;
     /**
      * 泥浆性能-密度(g/cm³)
      */