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

征求意见查询bug修复

Browse Source
This commit is contained in:
yuezhihang
2022-01-05 15:44:52 +08:00
parent 62072ceeca
commit d7c9a117b5
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+13 -5
View File
@@ -47,11 +47,19 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
public IPage<SarPublicIdea> selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end, String type) { 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<>();
if ("1".equals(type)) { if ("1".equals(type)) {
list.like(StringUtils.isNotEmpty(category), "category", category) if (start!=null && end !=null){
.like(StringUtils.isNotEmpty(cname), "cid", cname) list.like(StringUtils.isNotEmpty(category), "category", category)
.ge(start != null, "start_time", start) .like(StringUtils.isNotEmpty(cname), "cid", cname)
.le(end != null, "end_time", end) .ge(start != null, "start_time", start)
.orderByDesc("start_time"); .le(end != null, "end_time", end)
.orderByDesc("start_time");
}else {
list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cid", cname)
.le(start != null, "start_time", start)
.ge(end != null, "end_time", end)
.orderByDesc("start_time");
}
} else { } else {
list.like(StringUtils.isNotEmpty(category), "category", category) list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cname", cname) .like(StringUtils.isNotEmpty(cname), "cname", cname)