提醒修正查询逻辑

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<bdgzsomthingDO> {
 
     List<bdgzsomthingDO> selectPagelist(bdgzsomthingDO BdgzsomthingDO);
     default PageResult<bdgzsomthingDO> selectPage(bdgzsomthingPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<bdgzsomthingDO>()
+        MPJLambdaQueryWrapper<bdgzsomthingDO> query = new MPJLambdaQueryWrapper<>();
-                .betweenIfPresent(bdgzsomthingDO::getCreateTime, reqVO.getCreateTime())
+        if (reqVO.getCreateTime() != null) {
-                .eqIfPresent(bdgzsomthingDO::getClick, reqVO.getClick())
+            query.apply("create_time BETWEEN {0} AND {1}", reqVO.getCreateTime()[0], reqVO.getCreateTime()[1]);
-                .eqIfPresent(bdgzsomthingDO::getClickid, reqVO.getClickid())
+        }
-                .likeIfPresent(bdgzsomthingDO::getThingname, reqVO.getThingname())
+
-                .eqIfPresent(bdgzsomthingDO::getThings, reqVO.getThings())
+        if (reqVO.getClick() != null) {
-                .eqIfPresent(bdgzsomthingDO::getLevel, reqVO.getLevel())
+            query.eq(bdgzsomthingDO::getClick, reqVO.getClick());
-//                .likeIfPresent(bdgzsomthingDO::getShowname, reqVO.getShowname())
+        }
-                .eqIfPresent(bdgzsomthingDO::getDborgz, reqVO.getDborgz())
+
-                .eqIfPresent(bdgzsomthingDO::getYesorno, reqVO.getYesorno())
+        if (reqVO.getClickid() != null) {
-                .eqIfPresent(bdgzsomthingDO::getAttr1, reqVO.getAttr1())
+            query.eq(bdgzsomthingDO::getClickid, reqVO.getClickid());
-                .eqIfPresent(bdgzsomthingDO::getAttr2, reqVO.getAttr2())
+        }
-                .eqIfPresent(bdgzsomthingDO::getAttr3, reqVO.getAttr3())
+
-                .eqIfPresent(bdgzsomthingDO::getAttr4, "0")
+        if (reqVO.getThingname() != null) {
-                .eqIfPresent(bdgzsomthingDO::getAttr5, reqVO.getAttr5())
+            query.like(bdgzsomthingDO::getThingname, reqVO.getThingname());
-                .betweenIfPresent(bdgzsomthingDO::getClicktime, reqVO.getClicktime())
+        }
-                .betweenIfPresent(bdgzsomthingDO::getNowtime, reqVO.getNowtime())
+
-                .eqIfPresent(bdgzsomthingDO::getAttr6, reqVO.getAttr6())
+        if (reqVO.getThings() != null) {
-                .eqIfPresent(bdgzsomthingDO::getAttr7, reqVO.getAttr7())
+            query.eq(bdgzsomthingDO::getThings, reqVO.getThings());
-                .eqIfPresent(bdgzsomthingDO::getAttr8, reqVO.getAttr8())
+        }
-                .eqIfPresent(bdgzsomthingDO::getAttr9, reqVO.getAttr9())
+
-                .eqIfPresent(bdgzsomthingDO::getAttr10, reqVO.getAttr10())
+        if (reqVO.getLevel() != null) {
-                .eqIfPresent(bdgzsomthingDO::getAttr11, reqVO.getAttr11())
+            query.eq(bdgzsomthingDO::getLevel, reqVO.getLevel());
-                .eqIfPresent(bdgzsomthingDO::getAttr12, reqVO.getAttr12())
+        }
-                .eqIfPresent(bdgzsomthingDO::getAttr13, reqVO.getAttr13())
+
-                .eqIfPresent(bdgzsomthingDO::getAttr14, reqVO.getAttr14())
+        if (reqVO.getDborgz() != null) {
-                .eqIfPresent(bdgzsomthingDO::getAttr15, reqVO.getAttr15())
+            query.eq(bdgzsomthingDO::getDborgz, reqVO.getDborgz());
-                .ne(bdgzsomthingDO::getAttr12,1)
+        }
-                .orderByDesc(bdgzsomthingDO::getId));
+
+        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);

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<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{
                         //插入方法

mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml

@@ -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