fix:大屏充装单位统计查询调整

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -622,8 +622,9 @@
             tz_base_enterprise_info i
         WHERE
             i.app_id = f.app_id
-          AND	f.filling_endtime >= concat(#{startTime}, ' 00:00:00')
+          AND f.filling_endtime >= concat(#{startTime}, ' 00:00:00')
           AND i.org_code like concat(#{orgCode}, '%')
+          AND i.unit_type like '%充装单位%'
         GROUP BY
             filling_time
         ORDER BY

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CylinderStatisticsMapper.xml

@@ -50,7 +50,7 @@
                    ( T.filling_quantity )
         FROM
             tz_cylinder_filling_record T
-                INNER JOIN tz_base_enterprise_info E ON T.app_id = E.app_id
+                INNER JOIN tz_base_enterprise_info E ON T.app_id = E.app_id and E.unit_type like '%充装单位%'
         WHERE
             E.supervise_org_code LIKE concat ( #{orgCode}, '%' )
     </select>
@@ -60,7 +60,7 @@
                    ( T.offloading_volume )
         FROM
             tz_cylinder_offloading T
-                INNER JOIN tz_base_enterprise_info E ON T.app_id = E.app_id
+                INNER JOIN tz_base_enterprise_info E ON T.app_id = E.app_id and E.unit_type like '%充装单位%'
         WHERE
             E.supervise_org_code LIKE concat ( #{orgCode}, '%' )
     </select>
@@ -69,7 +69,7 @@
                    ( DISTINCT ( E.app_id ) )
         FROM
             tz_cylinder_filling_record
-                T INNER JOIN tz_base_enterprise_info E ON T.app_id = E.app_id
+                T INNER JOIN tz_base_enterprise_info E ON T.app_id = E.app_id and E.unit_type like '%充装单位%'
         WHERE
             E.supervise_org_code LIKE concat ( #{orgCode}, '%' )
     </select>