修改 辅屏查询接口

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertCalledDto.java

@@ -140,4 +140,7 @@ public class AlertCalledDto  extends BaseDto {
 
     @ApiModelProperty(value = "结案说明")
     private String finalReason;
+
+    @ApiModelProperty(value = "是否辅屏查询")
+    private String isAuxiliaryScreen;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/AlertCalled.java

@@ -217,4 +217,8 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "响应级别")
     private String responseLevel;
 
+    @TableField(exist=false)
+    @ApiModelProperty(value = "是否辅屏查询")
+    private String isAuxiliaryScreen;
+
 }

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

@@ -270,9 +270,11 @@ public class AlertCalledController extends BaseController {
 
 		queryWrapper.orderByDesc("call_time");
 
-		if(null != alertCalled.getCallTimeStart() && null != alertCalled.getCallTimeEnd()) {
-			queryWrapper.between("call_time", alertCalled.getCallTimeStart(),
-					alertCalled.getCallTimeEnd().getTime());
+		if(!ValidationUtil.isEmpty(alertCalled.getIsAuxiliaryScreen())) {
+			if(!ValidationUtil.isEmpty(alertCalled.getCallTimeStart()) && !ValidationUtil.isEmpty(alertCalled.getCallTimeEnd())) {
+				queryWrapper.between("call_time", alertCalled.getCallTimeStart(),
+						alertCalled.getCallTimeEnd().getTime());
+			}
 		} else {
 			queryWrapper.between("call_time", DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN),
 					DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
@@ -282,15 +284,15 @@ public class AlertCalledController extends BaseController {
 			queryWrapper.isNull("father_alert");
 		}
 
-		if(ValidationUtil.isEmpty(alertCalled.getType())) {
+		if(!ValidationUtil.isEmpty(alertCalled.getType())) {
 			queryWrapper.eq("type",alertCalled.getType());
 		}
 
-		if(ValidationUtil.isEmpty(alertCalled.getAlarmType())) {
+		if(!ValidationUtil.isEmpty(alertCalled.getAlarmType())) {
 			queryWrapper.eq("alarm_type",alertCalled.getAlarmType());
 		}
 
-		if(ValidationUtil.isEmpty(alertCalled.getAlertSource())) {
+		if(!ValidationUtil.isEmpty(alertCalled.getAlertSource())) {
 			queryWrapper.eq("alert_source",alertCalled.getAlertSource());
 		}
 		return queryWrapper;