pms 瑞恒 用电量单位调整 瑞都 工单完成情况调整

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

@@ -994,6 +994,15 @@ public class IotRhDailyReportController {
                 // 赋值
                 reportVO.setTransitTimeRate(transitTimeRate);
             }
+
+            // 转换用电量 单位 kWh 转换成 MWh
+            // 用电量 kWh 转换单位 MWh
+            if (reportVO.getDailyPowerUsage().compareTo(BigDecimal.ZERO) > 0) {
+                BigDecimal powerW = reportVO.getDailyPowerUsage()
+                        .divide(BigDecimal.valueOf(1000), 4, RoundingMode.HALF_UP);
+                reportVO.setDailyPowerUsage(powerW);
+            }
+
             // 2.1 拼接部门信息
             findAndThen(deptMap, reportVO.getDeptId(), dept -> reportVO.setDeptName(dept.getName()));
 
@@ -1265,6 +1274,12 @@ public class IotRhDailyReportController {
                 // 赋值
                 reportVO.setTransitTimeRate(transitTimeRate);
             }
+            // 用电量 kWh 转换单位 MWh
+            if (reportVO.getDailyPowerUsage().compareTo(BigDecimal.ZERO) > 0) {
+                BigDecimal powerW = reportVO.getDailyPowerUsage()
+                        .divide(BigDecimal.valueOf(1000), 4, RoundingMode.HALF_UP);
+                reportVO.setDailyPowerUsage(powerW);
+            }
             // 2.1 拼接部门信息
             findAndThen(deptMap, reportVO.getDeptId(), dept -> reportVO.setDeptName(dept.getName()));
 

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/iotprojecttask/IotRdDailyReportMapper.xml

@@ -305,6 +305,7 @@
         SELECT status AS status, COUNT(status) AS num FROM rq_iot_rd_daily_report a
         <where>
             a.deleted = 0
+            AND (a.platform_well = 0 OR a.platform_well = 1)
             <if test="reqVO.createTime[0] != null">
                 AND a.create_time &gt;= #{reqVO.createTime[0]}
             </if>