提醒修正查询逻辑
This commit is contained in:
Ledo
parent
aef91a2825
commit
4243d2e464
@ -6,6 +6,7 @@ import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.bdgzsomthing.vo.bdgzsomthingPageReqVO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO;
|
||||
import com.github.yulichang.query.MPJLambdaQueryWrapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@ -21,35 +22,80 @@ public interface bdgzsomthingMapper extends BaseMapperX<bdgzsomthingDO> {
|
||||
|
||||
List<bdgzsomthingDO> selectPagelist(bdgzsomthingDO BdgzsomthingDO);
|
||||
default PageResult<bdgzsomthingDO> selectPage(bdgzsomthingPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<bdgzsomthingDO>()
|
||||
.betweenIfPresent(bdgzsomthingDO::getCreateTime, reqVO.getCreateTime())
|
||||
.eqIfPresent(bdgzsomthingDO::getClick, reqVO.getClick())
|
||||
.eqIfPresent(bdgzsomthingDO::getClickid, reqVO.getClickid())
|
||||
.likeIfPresent(bdgzsomthingDO::getThingname, reqVO.getThingname())
|
||||
.eqIfPresent(bdgzsomthingDO::getThings, reqVO.getThings())
|
||||
.eqIfPresent(bdgzsomthingDO::getLevel, reqVO.getLevel())
|
||||
// .likeIfPresent(bdgzsomthingDO::getShowname, reqVO.getShowname())
|
||||
.eqIfPresent(bdgzsomthingDO::getDborgz, reqVO.getDborgz())
|
||||
.eqIfPresent(bdgzsomthingDO::getYesorno, reqVO.getYesorno())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr1, reqVO.getAttr1())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr2, reqVO.getAttr2())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr3, reqVO.getAttr3())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr4, "0")
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr5, reqVO.getAttr5())
|
||||
.betweenIfPresent(bdgzsomthingDO::getClicktime, reqVO.getClicktime())
|
||||
.betweenIfPresent(bdgzsomthingDO::getNowtime, reqVO.getNowtime())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr6, reqVO.getAttr6())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr7, reqVO.getAttr7())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr8, reqVO.getAttr8())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr9, reqVO.getAttr9())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr10, reqVO.getAttr10())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr11, reqVO.getAttr11())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr12, reqVO.getAttr12())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr13, reqVO.getAttr13())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr14, reqVO.getAttr14())
|
||||
.eqIfPresent(bdgzsomthingDO::getAttr15, reqVO.getAttr15())
|
||||
.ne(bdgzsomthingDO::getAttr12,1)
|
||||
.orderByDesc(bdgzsomthingDO::getId));
|
||||
MPJLambdaQueryWrapper<bdgzsomthingDO> query = new MPJLambdaQueryWrapper<>();
|
||||
if (reqVO.getCreateTime() != null) {
|
||||
query.apply("create_time BETWEEN {0} AND {1}", reqVO.getCreateTime()[0], reqVO.getCreateTime()[1]);
|
||||
}
|
||||
|
||||
if (reqVO.getClick() != null) {
|
||||
query.eq(bdgzsomthingDO::getClick, reqVO.getClick());
|
||||
}
|
||||
|
||||
if (reqVO.getClickid() != null) {
|
||||
query.eq(bdgzsomthingDO::getClickid, reqVO.getClickid());
|
||||
}
|
||||
|
||||
if (reqVO.getThingname() != null) {
|
||||
query.like(bdgzsomthingDO::getThingname, reqVO.getThingname());
|
||||
}
|
||||
|
||||
if (reqVO.getThings() != null) {
|
||||
query.eq(bdgzsomthingDO::getThings, reqVO.getThings());
|
||||
}
|
||||
|
||||
if (reqVO.getLevel() != null) {
|
||||
query.eq(bdgzsomthingDO::getLevel, reqVO.getLevel());
|
||||
}
|
||||
|
||||
if (reqVO.getDborgz() != null) {
|
||||
query.eq(bdgzsomthingDO::getDborgz, reqVO.getDborgz());
|
||||
}
|
||||
|
||||
if (reqVO.getYesorno() != null) {
|
||||
query.eq(bdgzsomthingDO::getYesorno, reqVO.getYesorno());
|
||||
}
|
||||
|
||||
if (reqVO.getAttr1() != null) {
|
||||
query.eq(bdgzsomthingDO::getAttr1, reqVO.getAttr1());
|
||||
}
|
||||
|
||||
// ... 同样的逻辑应用于其他属性 ...
|
||||
|
||||
if (reqVO.getAttr15() != null) {
|
||||
query.eq(bdgzsomthingDO::getAttr15, reqVO.getAttr15());
|
||||
}
|
||||
|
||||
query.ne(bdgzsomthingDO::getAttr12, "1");
|
||||
query.orderByDesc(bdgzsomthingDO::getId);
|
||||
// return selectPage(reqVO, new LambdaQueryWrapperX<bdgzsomthingDO>()
|
||||
// .betweenIfPresent(bdgzsomthingDO::getCreateTime, reqVO.getCreateTime())
|
||||
// .eqIfPresent(bdgzsomthingDO::getClick, reqVO.getClick())
|
||||
// .eqIfPresent(bdgzsomthingDO::getClickid, reqVO.getClickid())
|
||||
// .likeIfPresent(bdgzsomthingDO::getThingname, reqVO.getThingname())
|
||||
// .eqIfPresent(bdgzsomthingDO::getThings, reqVO.getThings())
|
||||
// .eqIfPresent(bdgzsomthingDO::getLevel, reqVO.getLevel())
|
||||
//// .likeIfPresent(bdgzsomthingDO::getShowname, reqVO.getShowname())
|
||||
// .eqIfPresent(bdgzsomthingDO::getDborgz, reqVO.getDborgz())
|
||||
// .eqIfPresent(bdgzsomthingDO::getYesorno, reqVO.getYesorno())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr1, reqVO.getAttr1())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr2, reqVO.getAttr2())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr3, reqVO.getAttr3())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr4, "0")
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr5, reqVO.getAttr5())
|
||||
// .betweenIfPresent(bdgzsomthingDO::getClicktime, reqVO.getClicktime())
|
||||
// .betweenIfPresent(bdgzsomthingDO::getNowtime, reqVO.getNowtime())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr6, reqVO.getAttr6())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr7, reqVO.getAttr7())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr8, reqVO.getAttr8())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr9, reqVO.getAttr9())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr10, reqVO.getAttr10())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr11, reqVO.getAttr11())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr12, reqVO.getAttr12())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr13, reqVO.getAttr13())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr14, reqVO.getAttr14())
|
||||
// .eqIfPresent(bdgzsomthingDO::getAttr15, reqVO.getAttr15())
|
||||
// .orderByDesc(bdgzsomthingDO::getId));
|
||||
return selectPage(reqVO,query);
|
||||
}
|
||||
|
||||
void updatebdgzsomthingbyid(bdgzsomthingDO BdgzsomthingDO);
|
||||
|
||||
@ -216,6 +216,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
|
||||
public List<bdgzsomthingDO> getbdgzsomthingPagelist(bdgzsomthingPageReqVO pageReqVO) {
|
||||
bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO();
|
||||
BdgzsomthingDO.setClick(pageReqVO.getClick());
|
||||
|
||||
return bdgzsomthingMapper.selectPagelist(BdgzsomthingDO);
|
||||
}
|
||||
@Override
|
||||
@ -897,17 +898,19 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
|
||||
}else{
|
||||
if (hasRemindTimeSafeStorage){
|
||||
LocalDate today = LocalDate.now();
|
||||
List<bdgzsomthingDO> updateBatch = new ArrayList<>();
|
||||
// List<bdgzsomthingDO> updateBatch = new ArrayList<>();
|
||||
for (bdgzsomthingDO bdgzsomthingDO : selecteqint) {
|
||||
LocalDate updatetime = bdgzsomthingDO.getUpdateTime().toLocalDate();
|
||||
// 计算两个日期之间的天数差
|
||||
long daysBetween = ChronoUnit.DAYS.between(updatetime, today);
|
||||
if (daysBetween == Long.valueOf(remindTimeSafe)){
|
||||
bdgzsomthingDO.setAttr12("0");
|
||||
updateBatch.add(bdgzsomthingDO);
|
||||
bdgzsomthingDO.setYesorno("0");
|
||||
bdgzsomthingMapper.updateById(bdgzsomthingDO);
|
||||
// updateBatch.add(bdgzsomthingDO);
|
||||
}
|
||||
}
|
||||
bdgzsomthingMapper.updateBatch(updateBatch);
|
||||
// bdgzsomthingMapper.updateBatch(updateBatch);
|
||||
}
|
||||
|
||||
}
|
||||
@ -973,17 +976,19 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
|
||||
if(CollUtil.isNotEmpty(selecteqint)){
|
||||
if (hasRemindTimeSafeStorage){
|
||||
LocalDate today = LocalDate.now();
|
||||
List<bdgzsomthingDO> updateBatch = new ArrayList<>();
|
||||
// List<bdgzsomthingDO> updateBatch = new ArrayList<>();
|
||||
for (bdgzsomthingDO bdgzsomthingDO : selecteqint) {
|
||||
LocalDate updatetime = bdgzsomthingDO.getUpdateTime().toLocalDate();
|
||||
// 计算两个日期之间的天数差
|
||||
long daysBetween = ChronoUnit.DAYS.between(updatetime, today);
|
||||
if (daysBetween == Long.valueOf(remindTimeSafe)){
|
||||
bdgzsomthingDO.setAttr12("0");
|
||||
updateBatch.add(bdgzsomthingDO);
|
||||
bdgzsomthingDO.setYesorno("0");
|
||||
bdgzsomthingMapper.updateById(bdgzsomthingDO);
|
||||
// updateBatch.add(bdgzsomthingDO);
|
||||
}
|
||||
}
|
||||
bdgzsomthingMapper.updateBatch(updateBatch);
|
||||
// bdgzsomthingMapper.updateBatch(updateBatch);
|
||||
}
|
||||
}else{
|
||||
//插入方法
|
||||
|
||||
@ -101,6 +101,8 @@
|
||||
<if test="click != null and click != ''">
|
||||
and click =#{click}
|
||||
</if>
|
||||
and
|
||||
(attr12 = 0 or attr12 is null)
|
||||
</where>
|
||||
ORDER BY
|
||||
CASE level
|
||||
|
||||
Loading…
Reference in New Issue
Block a user