修改 查询激活码SQL

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

@@ -85,13 +85,18 @@
         SELECT
         IFNULL(SUM((IF(qr_type=1,package.qr_number,0))),0) qrBoxNumber,
         IFNULL(SUM((IF(qr_type=2,package.qr_number,0))),0) qrCapNumber
-        FROM qr_package package
-        LEFT JOIN  qr_box_mapping boxmap ON package.id=boxmap.package_id
+        FROM (
+            select
+                    qrbox.qr_code_count qr_number,
+                    qrpa.qr_type,
+                    qrbox.active_time
+            FROM qr_package qrpa
+            INNER JOIN qr_box_mapping qrbox ON qrpa.id=qrbox.package_id
+            WHERE qrbox.active_status=1 ) package
         <where>
             <if test="null != beginDate and null != endDate">
-                AND boxmap.active_time BETWEEN #{beginDate} AND #{endDate}
+                AND package.active_time BETWEEN #{beginDate} AND #{endDate}
             </if>
-                AND  boxmap.active_status ='1'
         </where>
     </select>