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:
panshuling321 2022-02-21 14:03:32 +08:00
parent a54177d0da
commit dc045ab63d
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java
View File

@ -25,11 +25,16 @@ public class OrderLogController extends BaseController {
OrderLogService orderLogService; OrderLogService orderLogService;
@GetMapping("/getPage") @GetMapping("/getPage")
public TableDataInfo getOrderPage(@RequestParam(required = false) String tenantId, public TableDataInfo getOrderPage(
@RequestParam(required = false) String orderId,
@RequestParam(required = false) String phone,
@RequestParam(required = false) String tenantId,
@RequestParam(required = false) Integer number){ @RequestParam(required = false) Integer number){
startPage(); startPage();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("orderId", orderId);
params.put("phone", phone);
params.put("operatorId", SecurityUtils.getUserId()); params.put("operatorId", SecurityUtils.getUserId());
params.put("number", number); params.put("number", number);
params.put("tenantId", tenantId); params.put("tenantId", tenantId);

5
xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java
View File

@ -26,11 +26,14 @@ public class PileLogController extends BaseController {
@GetMapping("/getPage") @GetMapping("/getPage")
public TableDataInfo getPilePage(@RequestParam(required = false) String tenantId, public TableDataInfo getPilePage(
@RequestParam(required = false) String stationName,
@RequestParam(required = false) String tenantId,
@RequestParam(required = false) Integer number) { @RequestParam(required = false) Integer number) {
startPage(); startPage();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("stationName", stationName);
params.put("operatorId", SecurityUtils.getUserId()); params.put("operatorId", SecurityUtils.getUserId());
params.put("number", number); params.put("number", number);
params.put("tenantId", tenantId); params.put("tenantId", tenantId);

5
xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml
View File

@ -98,6 +98,9 @@
<!-- <if test="chargingStationId !=null and chargingStationId!=''">--> <!-- <if test="chargingStationId !=null and chargingStationId!=''">-->
<!-- and cp.charging_station_id=#{chargingStationId}--> <!-- and cp.charging_station_id=#{chargingStationId}-->
<!-- </if>--> <!-- </if>-->
<if test="params.stationName!=null and params.stationName!=''">
and st.name like CONCAT('%',#{params.stationName},'%')
</if>
<if test="params.number !=0 and params.number ==1"> <if test="params.number !=0 and params.number ==1">
and cp.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId}) and cp.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId})
</if> </if>
@ -107,7 +110,7 @@
<if test="params.tenantId != null and params.tenantId != ''"> <if test="params.tenantId != null and params.tenantId != ''">
and cp.tenant_id = #{params.tenantId} and cp.tenant_id = #{params.tenantId}
</if> </if>
order by cp.create_time desc order by cp.charging_station_id, cp.charging_pile_id
</select> </select>
<insert id="addXhpcChargingPile" parameterType="com.xhpc.common.domain.XhpcChargingPile" useGeneratedKeys="true" <insert id="addXhpcChargingPile" parameterType="com.xhpc.common.domain.XhpcChargingPile" useGeneratedKeys="true"

3
xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -15,6 +15,9 @@
from xhpc_charge_order as co from xhpc_charge_order as co
left join xhpc_charging_station as st on st.charging_station_id =co.charging_station_id left join xhpc_charging_station as st on st.charging_station_id =co.charging_station_id
where co.del_flag =0 where co.del_flag =0
<if test="params.orderId!=null and params.orderId!=''">
and co.serial_number like concat('%', #{params.orderId},'%')
</if>
<if test="params.number !=0 and params.number ==1"> <if test="params.number !=0 and params.number ==1">
and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId}) and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId})
</if> </if>