autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-19 06:39:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改首页数据接口bug

Browse Source
This commit is contained in:
Guoqs
2024-06-14 15:48:42 +08:00
parent f77fcfec80
commit 0c74b24210
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1989,7 +1989,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
// return orderBasicInfoMapper.getIndexOrderInfo(dto); // return orderBasicInfoMapper.getIndexOrderInfo(dto);
List<IndexOrderInfoVO> voList = orderBasicInfoMapper.getIndexOrderInfoV2(dto); List<IndexOrderInfoVO> voList = orderBasicInfoMapper.getIndexOrderInfoV2(dto);
Map<String, List<IndexOrderInfoVO>> map = voList.stream().collect(Collectors.groupingBy(IndexOrderInfoVO::getDate)); Map<String, List<IndexOrderInfoVO>> map = voList.stream().collect(Collectors.groupingBy(IndexOrderInfoVO::getDate));
List<IndexOrderInfoVO> resultList = Lists.newArrayList(); List<IndexOrderInfoVO> resultList = Lists.newArrayList();

3
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -2701,7 +2701,8 @@
use_electricity AS totalElectricity, use_electricity AS totalElectricity,
total_amount as totalOrderAmount total_amount as totalOrderAmount
from settle_order_report from settle_order_report
where date(trade_date) &gt;= DATE_SUB(CURDATE(), INTERVAL 30 day) where del_flag = '0'
and date(trade_date) &gt;= DATE_SUB(CURDATE(), INTERVAL 30 day)
<if test="dto.stationId != null and dto.stationId != ''"> <if test="dto.stationId != null and dto.stationId != ''">
and station_id = #{dto.stationId,jdbcType=VARCHAR} and station_id = #{dto.stationId,jdbcType=VARCHAR}
</if> </if>