From bd849f6d262ce7c13a706805b0373bb0fa76e7fe Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Tue, 20 Jul 2021 18:22:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3(=E5=A2=9E=E5=8A=A0=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../station/controller/XhpcChargingStationController.java | 4 ++-- .../charging/station/mapper/XhpcChargingStationMapper.java | 7 ++++--- .../station/service/IXhpcChargingStationService.java | 2 +- .../station/service/XhpcChargingStationServiceImpl.java | 4 ++-- .../main/resources/mapper/XhpcChargingStationMapper.xml | 6 ++++++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java index 812a722b..aff49d82 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java @@ -35,10 +35,10 @@ public class XhpcChargingStationController extends BaseController { */ //@PreAuthorize(hasPermi = "system:station:list") @GetMapping("/list") - public TableDataInfo list(XhpcChargingStation xhpcChargingStation) + public TableDataInfo list(String name,String operatorName) { startPage(); - List> list = xhpcChargingStationService.selectXhpcChargingStationList(xhpcChargingStation); + List> list = xhpcChargingStationService.selectXhpcChargingStationList(name,operatorName); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java index 7ce7b93c..3f2285bc 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java @@ -1,6 +1,7 @@ package com.xhpc.charging.station.mapper; import com.xhpc.charging.station.domain.XhpcChargingStation; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -23,11 +24,11 @@ public interface XhpcChargingStationMapper { /** * 查询电站列表 - * - * @param xhpcChargingStation 电站 + * @param name 电站名称 + * @param operatorName 运营商名称 * @return 电站集合 */ - List> selectXhpcChargingStationList(XhpcChargingStation xhpcChargingStation); + List> selectXhpcChargingStationList(@Param("name")String name, @Param("operatorName")String operatorName); /** * 新增电站 diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java index 68700e5c..43a8cf67 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java @@ -27,7 +27,7 @@ public interface IXhpcChargingStationService { * @param xhpcChargingStation 电站 * @return 电站集合 */ - public List> selectXhpcChargingStationList(XhpcChargingStation xhpcChargingStation); + public List> selectXhpcChargingStationList(String name,String operatorName); /** * 新增电站 diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index f553d474..51cb98ae 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -46,10 +46,10 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi * @return 电站 */ @Override - public List> selectXhpcChargingStationList(XhpcChargingStation xhpcChargingStation) + public List> selectXhpcChargingStationList(String name,String operatorName) { //桩的统计、该时段金额 - List> list = xhpcChargingStationMapper.selectXhpcChargingStationList(xhpcChargingStation); + List> list = xhpcChargingStationMapper.selectXhpcChargingStationList(name,operatorName); for (int i = 0; i < list.size(); i++) { Map map = list.get(i); Long chargingStationId = Long.valueOf(map.get("chargingStationId").toString()); diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml index 5879311c..b9e9e967 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -47,6 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from xhpc_charging_station as cs left join xhpc_operator as ope on cs.operator_id = ope.operator_id where cs.del_flag =0 + + and cs.name like CONCAT('%',#{name},'%') + + + and ope.name like CONCAT('%',#{operatorName},'%') +