接警记录分页失效

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -111,7 +111,8 @@
         a.rescue_grid,
         a.coordinate_x,
         a.coordinate_y,
-        a.response_level
+        a.response_level,
+        COUNT (*) AS   total
         FROM
         jc_alert_called a
         <where>
@@ -146,6 +147,28 @@
         </where>
     </select>
 
+    <select id="selectAllCount" resultType="int">
+        SELECT
+        COUNT (*)
+        FROM
+        jc_alert_called a
+        <where>
+            a.is_delete = 0
+            <if test="alertStatus!= null ">
+                and alert_status = #{alertStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and call_time between #{startTime} and #{endTime}
+            </if>
+            <if test="alertTypeCode!= null ">
+                and alarm_type_code = #{alertTypeCode}
+            </if>
+            <if test="alertSourceCode!= null ">
+                and alert_source_code = #{alertSourceCode}
+            </if>
+        </where>
+    </select>
+
 
     <select id="AlertCalledcountTime" resultType="Integer">
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
 
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -45,11 +46,6 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerEquipDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertLocationLog;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.jcs.api.enums.ControllerTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
@@ -95,6 +91,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     FirefightersServiceImpl firefightersService;
     @Autowired
     KeySiteServiceImpl keySiteService;
+    @Autowired
+    AlertSubmittedServiceImpl alertSubmittedService;
 
     @Autowired
     private AlertLocationLogServiceImpl alertLocationLogService;
@@ -186,7 +184,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus, alertTypeCode, alertSourceCode, startTime, endTime,data,lift);
         IPage<AlertCalled> iPage = new Page<>();
         iPage.setRecords(list);
-        iPage.setTotal(list.size());
+        iPage.setTotal(alertCalledMapper.selectAllCount(alertStatus, alertTypeCode, alertSourceCode, startTime, endTime));
         return iPage;
         /* bug2407 表头筛选失效 补充条件方法 XML中添加了排序条件判断  data代表排序条件 lift 升降序 陈召 2021-09-03 结束*/
     }