From 91f752e40bfe0c7534ffc699af5a2a91f6f08249 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 3 Sep 2024 23:30:03 +0800 Subject: [PATCH] =?UTF-8?q?#=E5=9F=B9=E8=AE=AD=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hnac/hzims/safeproduct/train/vo/TrainParamVo.java | 3 +++ .../hnac/hzims/safeproduct/train/service/impl/TrainServiceImpl.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/train/vo/TrainParamVo.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/train/vo/TrainParamVo.java index 0e2f95e..02ab22e 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/train/vo/TrainParamVo.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/train/vo/TrainParamVo.java @@ -20,4 +20,7 @@ public class TrainParamVo { @ApiModelProperty(value = "培训结束时间") private String endTime; + + @ApiModelProperty(value = "主讲人名称") + private String speakerName; } \ No newline at end of file diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/service/impl/TrainServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/service/impl/TrainServiceImpl.java index c32aa89..734eb35 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/service/impl/TrainServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/service/impl/TrainServiceImpl.java @@ -32,7 +32,7 @@ public class TrainServiceImpl extends ServiceImpl impl LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); wrapper.orderByDesc(TrainEntity::getCreateTime); if(StringUtil.isNotBlank(params.getStationId())){ - wrapper.eq(TrainEntity::getStationId,params.getStartTime()); + wrapper.eq(TrainEntity::getStationId,params.getStationId()); } if(StringUtil.isNotBlank(params.getStartTime())){ wrapper.ge(TrainEntity::getTrainStartTime,params.getStartTime() + " 00:00:00"); @@ -40,6 +40,9 @@ public class TrainServiceImpl extends ServiceImpl impl if(StringUtil.isNotBlank(params.getEndTime())){ wrapper.le(TrainEntity::getTrainStartTime,params.getEndTime() + " 23:59:59"); } + if(StringUtil.isNotBlank(params.getSpeakerName())){ + wrapper.like(TrainEntity::getSpeakerName,params.getSpeakerName()); + } return super.page(page,wrapper); }