修改接警记录导出bug

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

@@ -101,7 +101,8 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
          String callTimeEnd,
          String type,
          String alertSource,
-         String alarmType);
+         String alarmType,
+         @Param("list") Set<String> userIds);
 
  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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.elevator.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.elevator.api.dto.*;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 警情接警填报记录接口类
@@ -80,7 +81,7 @@ public interface IAlertCalledService {
      * @param alarmType
      * @return
      */
-    List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType);
+    List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType, Set<String> userIds);
 
     /**
      * 获取坐席信息

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

@@ -520,7 +520,12 @@
 		<if test="alarmType != null and alarmType != ''">
 			AND a.alarm_type =  #{alarmType}
 		</if>
-
+		<if test="list != null ">
+			and a.rec_user_id in
+			<foreach collection="list" 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

@@ -545,6 +545,15 @@ public class AlertCalledController extends BaseController {
 	@ApiOperation(value = "导出接警记录信息", notes = "导出接警记录信息")
 	@GetMapping("/exportAlertRecord")
 	public void exportAlertRecord(AlertCalledRecordDto alertCalledQueryDto, HttpServletResponse response) {
+		//根据当前登陆人的所在区域 找到该区域内的接警人id 再找到相关警情
+		Set<String> userIds = new HashSet<>();
+		String regionCode = this.getSelectedOrgInfo().getCompany().getRegionCode();
+		List<TzsCitInfo> citInfoList = citInfoService.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getRegionCode, regionCode));
+		if (!ValidationUtil.isEmpty(citInfoList)) {
+			for (TzsCitInfo citInfo : citInfoList) {
+				userIds.add(citInfo.getCtiUserId());
+			}
+		}
 		List<AlertCalledRecordDto> list  = iAlertCalledService.queryAlertRecordListByQueryDto(
 				alertCalledQueryDto.getCallTimeStart() == null ? null
 						: DateUtils.date2LongStr(alertCalledQueryDto.getCallTimeStart()),
@@ -552,7 +561,8 @@ public class AlertCalledController extends BaseController {
 						: DateUtils.date2LongStr(alertCalledQueryDto.getCallTimeEnd()),
 				alertCalledQueryDto.getType(),
 				alertCalledQueryDto.getAlertSource(),
-				alertCalledQueryDto.getAlarmType());
+				alertCalledQueryDto.getAlarmType(),
+				userIds);
 		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

@@ -401,8 +401,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     }
 
     @Override
-    public  List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType) {
-        List<AlertCalledRecordDto> list = alertCalledMapper.queryAlertRecordListByQueryDto(callTimeStart,callTimeEnd,type,alertSource,alarmType);
+    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);
         return list;
     }