修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

@@ -49,14 +49,14 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
                                     String endTime,
                                     String data,
                                     String lift,
-                                    String isFatherAlert);
+                                    String isFatherAlert,String systemSourceCode);
 
     int selectAllCount(Integer alertStatus,
                        String alertTypeCode ,
                        String alertSourceCode,
                        String startTime,
                        String endTime,
-                       String isFatherAlert);
+                       String isFatherAlert,String systemSourceCode);
 
     Integer AlertCalledcount(@Param("alertStatus")int alertStatus);
 

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

@@ -156,6 +156,9 @@
             <if test="alertSourceCode!= null ">
                 and a.alert_source_code = #{alertSourceCode}
             </if>
+            <if test="systemSourceCode!= null ">
+                and a.system_source_code = #{systemSourceCode}
+            </if>
             <if test="isFatherAlert != null and isFatherAlert == 'true' ">
                 and   j.alert_called_id = a.sequence_nbr
                 GROUP BY a.sequence_nbr
@@ -196,6 +199,9 @@
             <if test="alertSourceCode!= null ">
                 and a.alert_source_code = #{alertSourceCode}
             </if>
+            <if test="systemSourceCode!= null ">
+                and a.system_source_code = #{systemSourceCode}
+            </if>
             <if test="isFatherAlert!= null and isFatherAlert == 'true' ">
                 and j.alert_called_id = a.sequence_nbr
                 GROUP BY a.sequence_nbr

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -213,8 +213,9 @@ public class AlertCalledController extends BaseController {
     public ResponseModel<IPage<AlertCalled>> listPage(String pageNum, String pageSize, String sort, AlertCalled alertCalled, Integer alertStatus,
                                                       String alertTypeCode,
                                                       String alertSourceCode,
-                                                      String callTimeStart,
                                                       String callTimeEnd,
+                                                      String callTimeStart,
+                                                      String systemSourceCode,
                                                       String isFatherAlert) {
        /* Page<AlertCalled> pageBean;
         IPage<AlertCalled> page;
@@ -240,7 +241,7 @@ public class AlertCalledController extends BaseController {
         陈召 2021-08-21 开始*/
         IPage<AlertCalled> alertCalledIPage = null;
 
-        alertCalledIPage = iAlertCalledService.queryForCalledList(page, alertStatus, alertTypeCode, alertSourceCode, callTimeStart, callTimeEnd, sort,isFatherAlert);
+        alertCalledIPage = iAlertCalledService.queryForCalledList(page, alertStatus, alertTypeCode, alertSourceCode, callTimeStart, callTimeEnd, sort,isFatherAlert,systemSourceCode);
         /*  bug  2406   接警记录，列表缺少警情状态字段  by litw start*/
         alertCalledIPage.getRecords().stream().forEach(e -> {
             if (e.getAlertStatus()) {

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

@@ -203,7 +203,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 //        List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus, alertTypeCode, alertSourceCode, startTime, endTime, data, lift);
 //    }
 	public IPage<AlertCalled> queryForCalledList(Page pageBean, Integer alertStatus, String alertTypeCode,
-			String alertSourceCode, String startTime, String endTime, String sort, String isFatherAlert) {
+			String alertSourceCode, String startTime, String endTime, String sort, String isFatherAlert, String systemSourceCode) {
 
 		String[] split = sort != null ? sort.split(",") : null;
 		/* 2407 【web】日常值班>警情记录>接警记录，表头排序功能失效 chenzhao 09-28 start */
@@ -231,11 +231,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 		String lift = split != null ? split[1] : null;
 
 		List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus,
-				alertTypeCode, alertSourceCode, startTime, endTime, data, lift, isFatherAlert);
+				alertTypeCode, alertSourceCode, startTime, endTime, data, lift, isFatherAlert,systemSourceCode);
 		IPage<AlertCalled> iPage = new Page<>();
 		iPage.setRecords(list);
 		iPage.setTotal(alertCalledMapper.selectAllCount(alertStatus, alertTypeCode, alertSourceCode, startTime, endTime,
-				isFatherAlert));
+				isFatherAlert,systemSourceCode));
 		// iPage.setSize(pageBean.getSize());
 
 		return iPage;