解决分页

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/dao/AlarmTypeDetailMapper.java

@@ -55,7 +55,7 @@ public interface AlarmTypeDetailMapper {
     * @param condition:
     * @return java.util.List<AlarmTypeDetailsEntityVo>
     **/
-    List<AlarmTypeDetailsEntityVo> selectList(@Param("alarmDetailsDto") AlarmTypeDetailsDto alarmDetailsDto, @Param("userCondition") UserCondition condition);
+    List<AlarmTypeDetailsEntityVo> selectList(@Param("dto") AlarmTypeDetailsDto alarmDetailsDto, @Param("userCondition") UserCondition condition);
 
     /**
     * 更新状态

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/mapper/AlarmTypeDetailMapper.xml

@@ -109,13 +109,13 @@
                 and sad.alarm_end_time <= #{dto.endTime}
             </if>
             <if test="dto.state != null">
-                and sad.state >=#{dto.state}
+                and sad.state = #{dto.state}
             </if>
             <if test="dto.sceneType != null and dto.sceneType!=''" >
                 and sat.scene_type = #{dto.sceneType}
             </if>
             <include refid="permissionCondition"></include>
-            order by sad.create_date desc
+            order by sad.DATE_CREATE desc
         </where>
     </select>
 

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/config/MybatisPlusConfig.java

@@ -0,0 +1,18 @@
+package com.bz.zoneiot.water.web.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnClass(value = {PaginationInterceptor.class})
+public class MybatisPlusConfig {
+    @Bean
+      public PaginationInterceptor paginationInterceptor() {
+                PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+                paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
+                return paginationInterceptor;
+             }
+}