施工单位施工总量排名TOP10下钻列表

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

@@ -130,10 +130,11 @@
     </select>
     <select id="getNormalPage" resultType="java.util.Map">
         SELECT
-            tbei.use_unit_code AS useNnitCode
+            tbei.use_unit_code AS useUnitCode
         FROM
             tz_base_enterprise_info tbei
-            INNER JOIN tz_cylinder_offloading co ON tbei.app_id = co.app_id
+            LEFT JOIN tz_cylinder_offloading co ON tbei.app_id = co.app_id
+            LEFT JOIN tz_cylinder_filling_record cfr ON tbei.app_id = cfr.app_id
         WHERE
             tbei.unit_type LIKE'%充装单位%'
             <if test="dpFilterParamForDetailDto.timeSearchOne != null">
@@ -148,10 +149,10 @@
                 AND tbei.supervise_org_code  like concat(#{dpFilterParamForDetailDto.orgCode},'%')
             </if>
             <if test="dpFilterParamForDetailDto.isDock == 0">
-                AND ( fillingCount is null and offloadingVolume is null )
+                AND ( filling_quantity is null and offloading_volume is null )
             </if>
             <if test="dpFilterParamForDetailDto.isDock == 1">
-                AND ( fillingCount is not null OR offloadingVolume is not null )
+                AND ( filling_quantity is not null OR offloading_volume is not null )
             </if>
             <if test="dpFilterParamForDetailDto.companyName != null and dpFilterParamForDetailDto.companyName != '' ">
                 AND tbei.use_unit LIKE concat ( '%', #{dpFilterParamForDetailDto.companyName}, '%' )