Merge branch 'dev' of codeup.aliyun.com:67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml

@@ -532,10 +532,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 按merchantId分组汇总settle_order_report（每个商户一行，Java再汇总） -->
     <select id="getSettleReportGroupByMerchant" resultType="com.jsowell.pile.vo.web.IndexGeneralSituationVO">
         select
-            t1.total_amount as totalChargingAmount,
-            t1.settle_amount as totalSettleAmount,
-            t1.use_electricity as totalChargingDegree,
-            t1.charge_num as totalChargingQuantity
+            ifnull(sum(t1.total_amount), 0) as totalChargingAmount,
+            ifnull(sum(t1.settle_amount), 0) as totalSettleAmount,
+            ifnull(sum(t1.use_electricity), 0) as totalChargingDegree,
+            ifnull(sum(t1.charge_num), 0) as totalChargingQuantity
         from settle_order_report t1
         where t1.del_flag = '0'
         <if test="merchantIdList != null and merchantIdList.size() > 0">
@@ -544,6 +544,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        group by t1.merchant_id
     </select>
 
     <!-- 按stationId查settle_order_report原始行，Java汇总返回 -->