修改bug

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/AlertCalledRecordDto.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 接警记录导出
@@ -49,4 +50,6 @@ public class AlertCalledRecordDto {
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date callTimeEnd;
 
+   @ExcelIgnore
+   List<String> ids;
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/AlertCalledMapper.java

@@ -103,7 +103,8 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
          String type,
          String alertSource,
          String alarmType,
-         @Param("list") Set<String> userIds);
+         @Param("list") Set<String> userIds,
+         @Param("ids") List<String> ids);
 
  List<AlertPaperInfoDto> getAlertPaperInfoList(@Param("regionCodes") List<String> regionCodes, @Param("isHistory") Boolean isHistory);
 

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/service/IAlertCalledService.java

@@ -82,7 +82,7 @@ public interface IAlertCalledService {
      * @param alarmType
      * @return
      */
-    List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType, Set<String> userIds);
+    List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType, Set<String> userIds, List<String> ids);
 
     /**
      * 获取坐席信息

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

@@ -530,6 +530,12 @@
 				#{id}
 			</foreach>
 		</if>
+		<if test="ids != null ">
+			and a.sequence_nbr in
+			<foreach collection="ids" item="id" separator="," open="(" close=")">
+				#{id}
+			</foreach>
+		</if>
 
 	</select>
 

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

@@ -547,7 +547,8 @@ public class AlertCalledController extends BaseController {
 				alertCalledQueryDto.getType(),
 				alertCalledQueryDto.getAlertSource(),
 				alertCalledQueryDto.getAlarmType(),
-				userIds);
+				userIds,
+				alertCalledQueryDto.getIds());
 		String fileName = "接警记录" + System.currentTimeMillis();
 		ExcelUtil.createTemplate(response, fileName, "接警记录", list, AlertCalledRecordDto.class, null, false);
 	}

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/AlertCalledServiceImpl.java

@@ -449,8 +449,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     }
 
     @Override
-    public List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType, Set<String> userIds) {
-        List<AlertCalledRecordDto> list = alertCalledMapper.queryAlertRecordListByQueryDto(callTimeStart, callTimeEnd, type, alertSource, alarmType, userIds);
+    public List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType, Set<String> userIds, List<String> ids) {
+        List<AlertCalledRecordDto> list = alertCalledMapper.queryAlertRecordListByQueryDto(callTimeStart, callTimeEnd, type, alertSource, alarmType, userIds, ids);
         return list;
     }