运行记录优化

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotopeationfill/IotOpeationFillController.java

@@ -94,6 +94,17 @@ public class IotOpeationFillController {
         dailyToTotalMap.put("当日注气量", "累计注气量");
         dailyToTotalMap.put("当日公里数", "累计公里数");
         dailyToTotalMap.put("当日用电量", "累计用电量");
+        //泵车
+        dailyToTotalMap.put("泵车底盘发动机当日公里数", "泵车底盘发动机累计公里数");
+        dailyToTotalMap.put("泵车台上发动机当日运行时长", "泵车台上发动机累计运行时长");
+        //管汇车
+        dailyToTotalMap.put("底盘发动机当日公里数", "底盘发动机累计公里数");
+        //供液撬
+        dailyToTotalMap.put("底盘发动机当日运行时长", "底盘发动机累计运行时长");
+        //混砂
+        dailyToTotalMap.put("底盘发动机当日运转时长", "底盘发动机累计运转时长");
+        dailyToTotalMap.put("台上发动机当日运转时长", "台上发动机累计运转时长");
+
 
         // 存储当日数据值的映射
         Map<String, BigDecimal> dailyValues = new HashMap<>();

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

@@ -181,7 +181,53 @@
             and
             a.order_id = d.id
             and
-            a.dept_id = d.dept_id
+            a.dept_id in
+            (    SELECT
+                        d1.id
+                        FROM
+                        system_dept d1
+                        WHERE
+                        d1.id = #{deptId}  -- 根部门ID，替换为你需要查询的部门ID
+
+                        UNION ALL
+
+                        SELECT
+                        d2.id
+                        FROM
+                        system_dept d1
+                        JOIN
+                        system_dept d2 ON d2.parent_id = d1.id
+                        WHERE
+                        d1.id = #{deptId}  -- 根部门ID
+
+                        UNION ALL
+
+                        SELECT
+                        d3.id
+                        FROM
+                        system_dept d1
+                        JOIN
+                        system_dept d2 ON d2.parent_id = d1.id
+                        JOIN
+                        system_dept d3 ON d3.parent_id = d2.id
+                        WHERE
+                        d1.id = #{deptId}  -- 根部门ID
+
+                        UNION ALL
+
+                        SELECT
+                        d4.id
+                        FROM
+                        system_dept d1
+                        JOIN
+                        system_dept d2 ON d2.parent_id = d1.id
+                        JOIN
+                        system_dept d3 ON d3.parent_id = d2.id
+                        JOIN
+                        system_dept d4 ON d4.parent_id = d3.id
+                        WHERE
+                        d1.id = #{deptId}
+        )
             <if test="orderId != null  and orderId != ''">
                 and a.order_id = #{orderId}
             </if>