yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加大屏按区域统计接口

Browse Source
This commit is contained in:
yuyang 2022-05-13 09:54:53 +08:00
parent aeaee7c699
commit 7d448c6681
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml
View File

@ -60,10 +60,10 @@
and cc.create_time <![CDATA[ <= ]]> #{params.endTime}
</if>
<if test="params.type==1">
and cc.operator_id= in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId}))
and cc.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId}))
</if>
<if test="params.type==2">
and cc.operator_id= in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId}))
and cc.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId}))
</if>
</select>

8
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
View File

@ -1452,4 +1452,12 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
}
//判斷活动时间、电费、服务费、公式是否和场站一致
private boolean getRateOrActivityFormul(){
return false;
}
}

2
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml
View File

@ -1061,7 +1061,7 @@
left join xhpc_internet_user as iu on iu.internet_user_id = ss.charging_mode
where ss.del_flag=0 and ss.type=2
<if test="startTime !=null and startTime !=''">
and ss.create_time &gt;= #{endTime}
and ss.create_time &gt;= #{startTime}
</if>
<if test="endTime !=null and endTime !=''">
and ss.create_time &lt;= #{endTime}

4
xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
View File

@ -325,10 +325,10 @@
and xo.operator_id =#{operatorId}
</if>
<if test="type==1">
and xo.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{userId}))
and xo.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{logOperatorId}))
</if>
<if test="type==2">
and xo.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{userId}))
and xo.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{logOperatorId}))
</if>
group by xo.operator_id
ORDER BY xo.update_time DESC