diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bdgzsomthing/bdgzsomthingMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bdgzsomthing/bdgzsomthingMapper.java index ad918f1..bf97b73 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bdgzsomthing/bdgzsomthingMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bdgzsomthing/bdgzsomthingMapper.java @@ -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 { List selectPagelist(bdgzsomthingDO BdgzsomthingDO); default PageResult selectPage(bdgzsomthingPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .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 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() +// .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); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java index 1761ef5..5aea9ef 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java @@ -216,6 +216,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { public List 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 updateBatch = new ArrayList<>(); +// List 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 updateBatch = new ArrayList<>(); +// List 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{ //插入方法 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml index ccb8ef9..4632458 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml @@ -101,6 +101,8 @@ and click =#{click} + and + (attr12 = 0 or attr12 is null) ORDER BY CASE level