Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java

@@ -38,6 +38,7 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
                                        String startTime, String endTime, String submissionName, Long submissionBranchId,
                                        Long sequenceNbr);
 
+    int selectAllCount();
     /**
      * 查询我发起的 分页
      * current 当前页

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml

@@ -32,6 +32,10 @@
         order by submission_time DESC limit #{current},#{size};
     </select>
 
+    <select id="selectAllCount" resultType="int">
+        SELECT COUNT(*) FROM cb_failure_details
+    </select>
+
     <select id="selectWebPage" resultType="com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto">
         SELECT
         sequence_nbr,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -144,7 +144,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
         IPage<FailureDetailsDto> iPage = new Page<>();
         iPage.setRecords(list);
-        iPage.setTotal(list.size());
+        iPage.setTotal(baseMapper.selectAllCount());
         return iPage;
     }
 

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

@@ -171,6 +171,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 
         String[] split =  sort!=null? sort.split(","):null;
         String data = split!=null? RedisKey.humpToLine(split[0]):null;
+        /*2407 【web】日常值班>警情记录>接警记录，表头排序功能失效 chenzhao 09-28 start*/
+        if (data.equals("alertType") || data.equals("alertSource")||data.equals("alarmType")){
+            data = data + "Code";
+        }
+            /*2407 【web】日常值班>警情记录>接警记录，表头排序功能失效 chenzhao 09-28 end*/
         String lift  =split!=null?split[1]:null;
 
         List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus, alertTypeCode, alertSourceCode, startTime, endTime,data,lift);