Parcourir la source

pms 保养查询 导出 添加 累计运行时长H

zhangcl il y a 8 heures
Parent
commit
5c8ce8f8d8

+ 9 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorder/IotMainWorkOrderController.java

@@ -392,7 +392,15 @@ public class IotMainWorkOrderController {
             deviceDistancesResult.forEach(distance -> {
                 // 设置施工状态 label
                 if (deviceStatusPair.containsKey(distance.getDeviceStatus())) {
-                    distance.setDeviceStatusLabel(deviceStatusPair.get(distance.getDeviceStatus()));
+                    String statusLabel = deviceStatusPair.get(distance.getDeviceStatus());
+                    // 转换成默认语言 中文
+                    if (StrUtil.isNotBlank(statusLabel) && statusLabel.contains("~~")) {
+                        // 截取首次~~之前的部分
+                        String processedName = statusLabel.substring(0, statusLabel.indexOf("~~"));
+                        distance.setDeviceStatusLabel(processedName);
+                    } else {
+                        distance.setDeviceStatusLabel(statusLabel);
+                    }
                 }
                 // 设置工单状态 未生成工单;已生成工单未执行
                 if (distance.isShouldWorkOrder() && distance.isRunningWorkOrder()) {

+ 5 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotDeviceExportRespVO.java

@@ -32,6 +32,10 @@ public class IotDeviceExportRespVO {
     @ExcelProperty("距离保养")
     private String mainDistance;
 
+    @Schema(description = "设备累计运行时间")
+    @ExcelProperty("累计运行时长H")
+    private BigDecimal totalRunTime;
+
     @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long brand;
 
@@ -157,8 +161,7 @@ public class IotDeviceExportRespVO {
      */
     @Schema(description = "设备累计运行里程")
     private BigDecimal totalMileage;
-    @Schema(description = "设备累计运行时间")
-    private BigDecimal totalRunTime;
+
     @Schema(description = "是否在线")
     private Integer ifInline;
 

+ 3 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotDeviceRespVO.java

@@ -176,8 +176,11 @@ public class IotDeviceRespVO {
      */
     @Schema(description = "设备累计运行里程")
     private BigDecimal totalMileage;
+
     @Schema(description = "设备累计运行时间")
+    @ExcelProperty("累计运行时长H")
     private BigDecimal totalRunTime;
+
     @Schema(description = "是否在线")
     private Integer ifInline;