FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

征求意见排序！！

Browse Source
This commit is contained in:
yuezhihang
2021-09-09 15:31:48 +08:00
parent 721f13febc
commit bbbf101055
3 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java
+2 -2
View File
@@ -39,7 +39,7 @@ public class SarPublicIdeaController extends BaseController<SarPublicIdea> {
@ApiOperation(value = "分页查询") @ApiOperation(value = "分页查询")
@GetMapping("/SelectAllPage") @GetMapping("/SelectAllPage")
public ResponseMessage selectAllPage(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size,String categorg, String cname, public ResponseMessage selectAllPage(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size,String categorg, String cname,
String start, String end){ String start, String end,String type){
Date startdate = null; Date startdate = null;
Date enddate = null; Date enddate = null;
SimpleDateFormat formater = new SimpleDateFormat(); SimpleDateFormat formater = new SimpleDateFormat();
@@ -54,7 +54,7 @@ public class SarPublicIdeaController extends BaseController<SarPublicIdea> {
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }
IPage<SarPublicIdea> Publiclist =sarPublicIdeaService.selectAllP(page,size,categorg,cname,startdate,enddate); IPage<SarPublicIdea> Publiclist =sarPublicIdeaService.selectAllP(page,size,categorg,cname,startdate,enddate,type);
return Result.success(Publiclist); return Result.success(Publiclist);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java
+1 -1
View File
@@ -20,6 +20,6 @@ import java.util.Date;
public interface ISarPublicIdeaService extends IService<SarPublicIdea> { public interface ISarPublicIdeaService extends IService<SarPublicIdea> {
String add(SarPublicIdea sarPublicIdea); String add(SarPublicIdea sarPublicIdea);
IPage<SarPublicIdea> selectAllP(Integer page, Integer size, String categorg, String cname, Date startdate, Date enddate); IPage<SarPublicIdea> selectAllP(Integer page, Integer size, String categorg, String cname, Date startdate, Date enddate, String type);
IPage<SarPublicIdea> selectAllDynamic(SeByoDto seByoDto); IPage<SarPublicIdea> selectAllDynamic(SeByoDto seByoDto);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+31 -25
View File
@@ -1,7 +1,6 @@
package com.adc.da.slrs.sarStandIdea.service.Impl; package com.adc.da.slrs.sarStandIdea.service.Impl;
import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaDao; import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaDao;
import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea;
@@ -22,7 +21,7 @@ import java.util.Date;
/** /**
* <p> * <p>
* 服务实现类 * 服务实现类
* </p> * </p>
* *
* @author super_liu * @author super_liu
@@ -36,7 +35,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
@Override @Override
public String add(SarPublicIdea sarPublicIdea) { public String add(SarPublicIdea sarPublicIdea) {
if (!sarPublicIdea.getId().isEmpty()){ if (!sarPublicIdea.getId().isEmpty()) {
sarPublicIdea.setId(UUIDUtils.randomUUID10()); sarPublicIdea.setId(UUIDUtils.randomUUID10());
sarPublicIdeaDao.insert(sarPublicIdea); sarPublicIdeaDao.insert(sarPublicIdea);
return "增加成功"; return "增加成功";
@@ -45,22 +44,29 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
} }
@Override @Override
public IPage<SarPublicIdea> selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end) { public IPage<SarPublicIdea> selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end, String type) {
QueryWrapper<SarPublicIdea> list = new QueryWrapper<>(); QueryWrapper<SarPublicIdea> list = new QueryWrapper<>();
list.like(StringUtils.isNotEmpty(category),"category",category) if ("1".equals(type)) {
.like(StringUtils.isNotEmpty(cname),"cname",cname) list.like(StringUtils.isNotEmpty(category), "category", category)
.ge(start!=null,"start_time",start) .like(StringUtils.isNotEmpty(cname), "cname", cname)
.le(end!=null,"end_time",end) .ge(start != null, "start_time", start)
.orderByAsc("end_time"); .le(end != null, "end_time", end)
Page<SarPublicIdea> page = new Page<>(p,size); .orderByDesc("start_time");
} else {
list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cname", cname)
.ge(start != null, "start_time", start)
.le(end != null, "end_time", end)
.orderByAsc("end_time");
}
Page<SarPublicIdea> page = new Page<>(p, size);
IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list); IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
System.out.println("总条数"+userIPage.getTotal()); System.out.println("总条数" + userIPage.getTotal());
System.out.println("总页数"+userIPage.getPages()); System.out.println("总页数" + userIPage.getPages());
return userIPage; return userIPage;
} }
/** /**
*
* @param seByoDto * @param seByoDto
* @return * @return
*/ */
@@ -72,33 +78,33 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
SimpleDateFormat formater = new SimpleDateFormat(); SimpleDateFormat formater = new SimpleDateFormat();
formater.applyPattern("yyyy-MM-dd"); formater.applyPattern("yyyy-MM-dd");
try { try {
if (seByoDto.getStartTime()!=null){ if (seByoDto.getStartTime() != null) {
sar.setStartTime(formater.parse(seByoDto.getStartTime())); sar.setStartTime(formater.parse(seByoDto.getStartTime()));
} }
if (seByoDto.getEndTime()!=null){ if (seByoDto.getEndTime() != null) {
sar.setEndTime(formater.parse(seByoDto.getEndTime())); sar.setEndTime(formater.parse(seByoDto.getEndTime()));
} }
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }
QueryWrapper<SarPublicIdea> wrapper = new QueryWrapper<>(); QueryWrapper<SarPublicIdea> wrapper = new QueryWrapper<>();
if (sar.getCategory()!=null&&sar.getCategory().length()!=0){ if (sar.getCategory() != null && sar.getCategory().length() != 0) {
wrapper.like("category",sar.getCategory()); wrapper.like("category", sar.getCategory());
} }
if (sar.getCname()!=null&&sar.getCname().length()!=0){ if (sar.getCname() != null && sar.getCname().length() != 0) {
wrapper.like("cname",sar.getCname()); wrapper.like("cname", sar.getCname());
} }
if (sar.getStartTime()!=null){ if (sar.getStartTime() != null) {
wrapper.le("start_time",sar.getStartTime()); wrapper.le("start_time", sar.getStartTime());
} }
if (sar.getEndTime()!=null){ if (sar.getEndTime() != null) {
wrapper.gt("end_time",sar.getEndTime()); wrapper.gt("end_time", sar.getEndTime());
} }
Page<SarPublicIdea> page = new Page<>(seByoDto.getPage(), seByoDto.getSize()); Page<SarPublicIdea> page = new Page<>(seByoDto.getPage(), seByoDto.getSize());
IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, wrapper); IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, wrapper);
System.out.println("总条数"+userIPage.getTotal()); System.out.println("总条数" + userIPage.getTotal());
System.out.println("总页数"+userIPage.getPages()); System.out.println("总页数" + userIPage.getPages());
return userIPage; return userIPage;