报表sql调整

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/ReportServiceMapper.xml

@@ -4,56 +4,56 @@
 
     <select id="queryBrandCodeProportion" resultType="com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO">
         SELECT
-        SUM( package.qr_number ) qrNumber,
-        brand.brand_name brandName
+        SUM( package.qr_number ) AS qr_number,
+        max(brand.brand_name) AS brand_name
         FROM
         qr_package AS package
         LEFT JOIN base_material AS material ON package.material_id = material.id
         LEFT JOIN base_sku AS sku ON material.sku_id = sku.id
         LEFT JOIN base_brand AS brand ON sku.sub_brand_code = brand.brand_code
         <where>
-            package.generate_status = 2
             <!--   1本周 2本月 -->
             <if test="null != reportReq.beginTime and null != reportReq.endTime">
                 and #{reportReq.beginTime} &lt; package.generate_time &lt; #{reportReq.endTime}
             </if>
+             and package.generate_status = 2
         </where>
-        GROUP BY brand.brand_code, brand.brand_name
+        GROUP BY brand.brand_code
     </select>
 
     <select id="querySkuCodeRanking" resultType="com.abi.qms.platform.dao.vo.result.ListSkuCodeReportVO">
-        select bs.sku_name,sum(qp.qr_number) as qr_number
+        select bs.sku_code,sum(qp.qr_number) as qr_number,max(bs.sku_name) as sku_name
         from qr_package qp
         LEFT JOIN base_material bm on qp.material_id  = bm.id
         LEFT JOIN base_sku bs on bm.sku_id  = bs.id
         <where>
-            qp.generate_status = 2
             <if test="null != reportReq.beginTime and null != reportReq.endTime">
-               AND qp.generate_time BETWEEN #{reportReq.beginTime} AND #{reportReq.endTime}
+                and #{reportReq.beginTime} &lt; qp.generate_time &lt; #{reportReq.endTime}
             </if>
+            and qp.generate_status = 2
         </where>
-        GROUP BY bs.sku_name
+        GROUP BY bs.sku_code
         ORDER BY qr_number DESC
     </select>
 
     <select id="queryFactoryCodeTotal" resultType="com.abi.qms.platform.dao.vo.result.ListFactoryCodeReportVO">
         SELECT
         bf.factory_code,
-        bf.factory_name,
-        sum( qp.qr_number ) qr_number
+        max(bf.factory_name) as factory_name,
+        sum( qp.qr_number ) as qr_number
         FROM
         qr_package qp
         LEFT JOIN base_factory bf ON qp.factory_cover_id = bf.id
         <where>
-            qp.generate_status = 2
             <if test="1 == isDownload">
                 AND qp.is_download = 1
             </if>
             <if test="null != reportReq.beginTime and null != reportReq.endTime">
-                AND qp.generate_time BETWEEN #{reportReq.beginTime} AND #{reportReq.endTime}
+                and #{reportReq.beginTime} &lt; qp.generate_time &lt; #{reportReq.endTime}
             </if>
+            and qp.generate_status = 2
         </where>
-        GROUP BY bf.factory_code,bf.factory_name
+        GROUP BY bf.factory_code
         ORDER BY qr_number DESC
     </select>