pms 瑞鹰 导出定额时长 定额时效

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

@@ -899,7 +899,14 @@ public class IotRyDailyReportController {
                 // 赋值
                 reportVO.setNonProductionRateFormat(nonProductionRate);
             }
-
+            // 定额时效
+            if (ObjUtil.isNotEmpty(reportVO.getAllocatedEfficiency())) {
+                BigDecimal percentage = reportVO.getAllocatedEfficiency().multiply(BigDecimal.valueOf(100));
+                // 格式化保留2位小数
+                DecimalFormat df = new DecimalFormat("0.00");
+                String rate = df.format(percentage) + "%";
+                reportVO.setAllocatedEfficiencyStr(rate);
+            }
             // 日报生成日期 格式化时间为 yyyy-MM-dd
             if (ObjUtil.isNotEmpty(reportVO.getCreateTime())) {
                 reportVO.setCreateTimeStr(LocalDateTimeUtil.format(reportVO.getCreateTime(), DatePattern.NORM_DATE_PATTERN));

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

@@ -248,6 +248,17 @@ public class IotRyDailyReportDetailComboRespVO {
     @ExcelProperty("工况")
     private String currentOperation;
 
+    @Schema(description = "定额时长(H)")
+    @ExcelProperty("定额时长(H)")
+    private BigDecimal allocatedTime;
+
+    @Schema(description = "定额时效(%)")
+    private BigDecimal allocatedEfficiency;
+
+    @Schema(description = "定额时效(%)")
+    @ExcelProperty("定额时效(%)")
+    private String allocatedEfficiencyStr;
+
     @Schema(description = "排序值")
     private Integer sort;