修改bug

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -8,7 +8,7 @@
 		count( 1 ) calledCount,
 		sum( CASE WHEN father_alert is null THEN
 		1 ELSE 0 END ) majorAlertCount,
-		sum( CASE WHEN alarm_type_code = '960'
+		sum( CASE WHEN alarm_type_code = '960' and alert_status = 0
 		THEN 1 ELSE 0 END )
 		sleepyIncidentCount,
 		sum( CASE WHEN alarm_type_code

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/AlertCalledController.java

@@ -438,19 +438,13 @@ public class AlertCalledController extends BaseController {
 		if (!ValidationUtil.isEmpty(alertCalled.getIsAuxiliaryScreen())) {
 			if (!ValidationUtil.isEmpty(alertCalled.getCallTimeStart())
 					&& !ValidationUtil.isEmpty(alertCalled.getCallTimeEnd())) {
-				queryWrapper.between("call_time_start", alertCalled.getCallTimeStart(),
+				queryWrapper.between("call_time", alertCalled.getCallTimeStart(),
 						alertCalled.getCallTimeEnd());
-			} else if (!ValidationUtil.isEmpty(alertCalled.getCallTimeStart())) {
-				queryWrapper.ge("call_time_start", alertCalled.getCallTimeStart());
 			}
 		} else {
-			if (!ValidationUtil.isEmpty(alertCalled.getCallTimeStart())) {
-				queryWrapper.ge("call_time_start", alertCalled.getCallTimeStart());
-			} else {
-				queryWrapper.between("call_time_start", DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_PATTERN),
+			queryWrapper.between("call_time", DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_PATTERN),
 					DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), 1).getTime(), DateUtils.DATE_PATTERN));
 		}
-		}
 
 		if (alertCalled.getIsFatherAlert()) { // 0：接警；1：处警
 			queryWrapper.isNull("father_alert");
@@ -467,7 +461,6 @@ public class AlertCalledController extends BaseController {
 		if (!ValidationUtil.isEmpty(alertCalled.getAlertSource())) {
 			queryWrapper.eq("alert_source", alertCalled.getAlertSource());
 		}
-
 		return queryWrapper;
 	}
 

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/RescueStationController.java

@@ -188,15 +188,6 @@ public class RescueStationController extends BaseController {
         }
         page = iRescueStationService.page(pageBean, rescueStationQueryWrapper);
         IPage<RescueStationDto> rescueStationDtoIPage = BeanDtoVoUtils.iPageVoStream(page, RescueStationDto.class);
-
-        // 获取查询结果列表
-        List<RescueStationDto> rescueStationList  = rescueStationDtoIPage.getRecords();
-        // 对救援站列表按照更新时间进行排序，新增的救援站将排在最前面
-        Collections.sort(rescueStationList, Comparator.comparing(RescueStationDto::getRecDate).reversed());
-        // 更新排序后的列表
-        rescueStationDtoIPage.setRecords(rescueStationList);
-
-
         return ResponseHelper.buildResponse(rescueStationDtoIPage);
     }
 
@@ -227,20 +218,8 @@ public class RescueStationController extends BaseController {
             page.setSize(Integer.parseInt(pageSize));
             page.setCurrent(Integer.parseInt(pageNum));
         }
-
         page = iRescueStationService.getRescueStationList(page,rescueStationDto);
         IPage<RescueStationDto> rescueStationDtoIPage = ObjectUtils.isEmpty(page)? new Page<>(): BeanDtoVoUtils.iPageVoStream(page, RescueStationDto.class);
-
-        // 获取查询结果列表
-        List<RescueStationDto> rescueStationList  = rescueStationDtoIPage.getRecords();
-        // 对救援站列表按照更新时间进行排序，新增的救援站将排在最前面
-        Collections.sort(rescueStationList, Comparator.comparing(RescueStationDto::getRecDate).reversed());
-        // 更新排序后的列表
-        rescueStationDtoIPage.setRecords(rescueStationList);
-
-        //        // 反转列表顺序
-        //        Collections.reverse(rescueStationList);
-
         return ResponseHelper.buildResponse(rescueStationDtoIPage);
     }
 

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DispatchTaskServiceImpl.java

@@ -839,6 +839,14 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                             if(alertFormValue.getFieldCode().equals("dispatch_status")) {
                                 alertFormValue.setFieldValue(DispatchPaperEnums.hasDispatched.getValue());
                                 alertFormValue.setFieldValueCode(DispatchPaperEnums.hasDispatched.getId());
+                            }else if(alertFormValue.getFieldCode().equals("response_level")) {
+                                alertFormValue.setFieldValue(DispatchPaperEnums.useUnit.getValue());
+                                alertFormValue.setFieldValueCode(DispatchPaperEnums.useUnit.getId());
+                                // 响应级别反馈给警情
+                                LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
+                                updateWrapper.eq(AlertCalled::getSequenceNbr,dispatchTask.getAlertId());
+                                updateWrapper.set(AlertCalled::getResponseLevel,DispatchPaperEnums.useUnit.getValue());
+                                alertCalledServiceImpl.update(updateWrapper);
                             }
                         });
                     }