From cf58eca004f9ee7f7a3c4cfe8c31bac03b65d16d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 7 Jun 2021 10:45:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=84=8F=E8=A7=81=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaController.java | 29 ++++++++++++++++--- .../service/ISarPublicIdeaService.java | 4 ++- .../Impl/SarPublicIdeaServiceImpl.java | 15 +++++++--- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index 76cba33b..ef3e5e5a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -4,7 +4,9 @@ package com.adc.da.slrs.sarStandIdea.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandIdea.entity.SeByoDto; +import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaService; import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaServiceImpl; +import com.adc.da.sys.util.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +15,10 @@ import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + /** *

* 前端控制器 @@ -27,13 +33,28 @@ import com.adc.da.base.web.BaseController; public class SarPublicIdeaController extends BaseController { @Autowired - private SarPublicIdeaServiceImpl sarPublicIdeaService; + private ISarPublicIdeaService sarPublicIdeaService; @ApiOperation(value = "分页查询") @GetMapping("/SelectAllPage") - public ResponseMessage selectAllPage(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size){ - IPage publicList =sarPublicIdeaService.selectAllP(page,size); - return Result.success(publicList); + public ResponseMessage selectAllPage(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size,String categorg, String cname, + String start, String end){ + Date startdate = null; + Date enddate = null; + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + try { + if (start!=null){ + startdate = formater.parse(start); + } + if (end!=null){ + enddate=formater.parse(DateUtil.addOneDay(end)); + } + } catch (ParseException e) { + e.printStackTrace(); + } + IPage Publiclist =sarPublicIdeaService.selectAllP(page,size,categorg,cname,startdate,enddate); + return Result.success(Publiclist); } @ApiOperation(value = "动态查询") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java index 8eea2621..10e58c4a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java @@ -7,6 +7,8 @@ import com.adc.da.slrs.sarStandIdea.entity.SeByoDto; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Date; + /** *

* 服务类 @@ -18,6 +20,6 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface ISarPublicIdeaService extends IService { String add(SarPublicIdea sarPublicIdea); - IPage selectAllP(Integer page, Integer size); + IPage selectAllP(Integer page, Integer size, String categorg, String cname, Date startdate, Date enddate); IPage selectAllDynamic(SeByoDto seByoDto); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index 0da60754..452cc0b0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -12,11 +12,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Date; /** *

@@ -43,10 +45,15 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl selectAllP(Integer p, Integer size) { - QueryWrapper wrapper = new QueryWrapper<>(); - Page page = new Page<>(p, size); - IPage userIPage = sarPublicIdeaDao.selectPage(page, wrapper); + public IPage selectAllP(Integer p, Integer size, String categorg, String cname, Date start, Date end) { + QueryWrapper list = new QueryWrapper<>(); + list.eq(StringUtils.isNotEmpty(categorg),"CATEGORG",categorg) + .like(StringUtils.isNotEmpty(cname),"CNAME",cname) + .gt(start!=null,"STARTTIME",start). + le(end!=null,"ENDTIME",end); + + Page page = new Page<>(p,size); + IPage userIPage = sarPublicIdeaDao.selectPage(page, list); System.out.println("总条数"+userIPage.getTotal()); System.out.println("总页数"+userIPage.getPages()); return userIPage;