pms 瑞恒导出增加 非生产时效 气电比

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/IotRhDailyReportController.java

@@ -879,6 +879,19 @@ public class IotRhDailyReportController {
             BigDecimal sumNpt = calculateNonProductTime(reportVO);
             reportVO.setNonProductionRate(sumNpt.divide(BigDecimal.valueOf(24), 4, RoundingMode.HALF_UP ));
 
+            // 非生产时效 百分比格式 导出使用
+            if (ObjUtil.isNotEmpty(reportVO.getNonProductionRate())) {
+                // 获取原始小数
+                BigDecimal nptRate = reportVO.getNonProductionRate();
+                // 乘以100转换为百分比数值
+                BigDecimal percentage = nptRate.multiply(BigDecimal.valueOf(100));
+                // 格式化保留2位小数
+                DecimalFormat df = new DecimalFormat("0.00");
+                String nonProductionRate = df.format(percentage) + "%";
+                // 赋值
+                reportVO.setNonProductionRateFormat(nonProductionRate);
+            }
+
             // 导出列表时 格式化时间为 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/iotrhdailyreport/vo/IotRhDailyReportRespVO.java

@@ -100,46 +100,75 @@ public class IotRhDailyReportRespVO {
     @ExcelProperty("当日油耗(L)")
     private BigDecimal dailyOilUsage;
 
+    @Schema(description = "气电比 塔里木、吐哈-气/电   其它-气/电/1.07")
+    @ExcelProperty("气电比")
+    private BigDecimal gasElectricityRatio;
+
     @Schema(description = "非生产时间(H)")
-    @ExcelProperty("非生产时间(H)")
     private BigDecimal nonProductionTime;
 
     @Schema(description = "非生产时间原因")
     private String nptReason;
 
     @Schema(description = "非生产时间原因 数据字典label值")
-    @ExcelProperty("非生产时间原因")
     private String nptReasonName;
 
+    @Schema(description = "非生产时效 百分比格式")
+    @ExcelProperty("非生产时效")
+    private String nonProductionRateFormat;
 
     @Schema(description = "事故非生产时间(H)")
+    @ExcelProperty("工程质量")
     private BigDecimal accidentTime;
+
     @Schema(description = "修理非生产时间(H)")
+    @ExcelProperty("设备故障")
     private BigDecimal repairTime;
+
     @Schema(description = "自停非生产时间(H)")
+    @ExcelProperty("设备保养")
     private BigDecimal selfStopTime;
+
     @Schema(description = "复杂非生产时间(H)")
+    @ExcelProperty("技术受限")
     private BigDecimal complexityTime;
+
     @Schema(description = "搬迁非生产时间(H)")
+    @ExcelProperty("生产配合")
     private BigDecimal relocationTime;
+
     @Schema(description = "整改非生产时间(H)")
+    @ExcelProperty("生产组织")
     private BigDecimal rectificationTime;
+
     @Schema(description = "等停非生产时间(H)")
+    @ExcelProperty("不可抗力")
     private BigDecimal waitingStopTime;
+
     @Schema(description = "冬休非生产时间(H)")
+    @ExcelProperty("待命")
     private BigDecimal winterBreakTime;
+
     @Schema(description = "甲方设计-非生产时间")
+    @ExcelProperty("甲方设计")
     private BigDecimal partyaDesign;
+
     @Schema(description = "甲方准备-非生产时间")
+    @ExcelProperty("甲方准备")
     private BigDecimal partyaPrepare;
+
     @Schema(description = "甲方资源-非生产时间")
+    @ExcelProperty("甲方资源")
     private BigDecimal partyaResource;
+
     @Schema(description = "其它非生产时间")
+    @ExcelProperty("其它非生产时间")
     private BigDecimal otherNptTime;
+
     @Schema(description = "其它非生产时间原因")
+    @ExcelProperty("其它非生产时间原因")
     private String otherNptReason;
 
-
     @Schema(description = "施工开始日期")
     private LocalDateTime constructionStartDate;
 
@@ -249,9 +278,6 @@ public class IotRhDailyReportRespVO {
     @Schema(description = "小组内最后1条记录标识 true false")
     private boolean lastGroupIdFlag = false;
 
-    @Schema(description = "气电比 塔里木、吐哈-气/电   其它-气/电/1.07")
-    private BigDecimal gasElectricityRatio;
-
     @Schema(description = "非生产时效")
     private BigDecimal nonProductionRate;
 }