更新代码

This commit is contained in:
付庆吉
2021-03-24 19:26:36 +08:00
parent b46f60c524
commit 47d1f3761e
3 changed files with 10 additions and 6 deletions

View File

@ -3,7 +3,6 @@ package com.chinaunicom.mall.ebtp.extend.bizbidnotice.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
@ -41,9 +40,11 @@ public class BizBidNoticeServiceImpl extends BaseServiceImpl<BizBidNoticeMapper,
wrapper.eq(BizBidNotice::getNoticeRelease, "open")
.like(StrUtil.isNotEmpty(bizBidNotice.getNoticeTitle()), BizBidNotice::getNoticeTitle, bizBidNotice.getNoticeTitle())
.like(StrUtil.isNotEmpty(bizBidNotice.getNoticeName()), BizBidNotice::getNoticeName, bizBidNotice.getNoticeName())
.between(bizBidNotice.getCreateDate() != null, BizBidNotice::getCreateDate, bizBidNotice.getCreateDate(),bizBidNotice.getCreateDate().plusDays(1L))
.orderByAsc(BizBidNotice::getNoticeTop);
if (bizBidNotice.getCreateDate() != null) {
wrapper.between(BizBidNotice::getCreateDate, bizBidNotice.getCreateDate(), bizBidNotice.getCreateDate().plusDays(1L));
}
IPage<BizBidNotice> page = this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper);
listRelease(page.getRecords());
return page;

View File

@ -39,9 +39,12 @@ public class BizBidSharedServiceImpl extends BaseServiceImpl<BizBidSharedMapper,
LambdaQueryWrapper<BizBidShared> wrapper = Wrappers.lambdaQuery();
wrapper.like(StrUtil.isNotEmpty(bizBidNotice.getSharedName()), BizBidShared::getSharedName, bizBidNotice.getSharedName())
.like(StrUtil.isNotEmpty(bizBidNotice.getSharedRole()), BizBidShared::getSharedRole, bizBidNotice.getSharedRole())
.between(bizBidNotice.getCreateDate() != null, BizBidShared::getCreateDate, bizBidNotice.getCreateDate(),bizBidNotice.getCreateDate().plusDays(1L))
.orderByDesc(BizBidShared::getCreateDate);
if (bizBidNotice.getCreateDate() != null) {
wrapper.between(BizBidShared::getCreateDate, bizBidNotice.getCreateDate(), bizBidNotice.getCreateDate().plusDays(1L));
}
Page<BizBidShared> page = this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper);
List<String> collect = page.getRecords().stream().map(BizBidShared::getSharedFile).distinct().collect(Collectors.toList());

View File

@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNotice;
import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.dao.BizBidSharedRecordMapper;
import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecord;
import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecordVO;
@ -35,9 +34,10 @@ public class BizBidSharedRecordServiceImpl extends BaseServiceImpl<BizBidSharedR
.eq(StrUtil.isNotEmpty(recordVO.getRecordName()), BizBidSharedRecord::getRecordName, recordVO.getRecordName())
.eq(StrUtil.isNotEmpty(recordVO.getRecordStaff()), BizBidSharedRecord::getRecordStaff, recordVO.getRecordStaff())
.eq(StrUtil.isNotEmpty(recordVO.getRecordAccount()), BizBidSharedRecord::getRecordAccount, recordVO.getRecordAccount())
.between(recordVO.getCreateDate() != null, BizBidSharedRecord::getCreateDate, recordVO.getCreateDate(),recordVO.getCreateDate().plusDays(1L))
.orderByDesc(BizBidSharedRecord::getCreateDate);
if (recordVO.getCreateDate() != null) {
wrapper.between(BizBidSharedRecord::getCreateDate, recordVO.getCreateDate(), recordVO.getCreateDate().plusDays(1L));
}
return this.page(new Page<>(recordVO.getPageNo(), recordVO.getPageSize()), wrapper);
}