From 533b39768b9295f3905f04cb581c5072835bd9b1 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 02 Jul 2021 11:25:43 +0800
Subject: [PATCH] 警情查询修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 04facd9..0567b0d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -109,7 +109,29 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入alarm")
public R<IPage<AlarmVO>> page(AlarmVO alarm, Query query) {
+ //获取部门数据
+ List<DeptVo> deptVos = deptFeignApi.selDeptList();
IPage<AlarmVO> pages = alarmService.selectAlarmPage(Condition.getPage(query), alarm);
+
+ //遍历数据
+ for (int j = 0; j < pages.getRecords().size(); j++) {
+ if (null!=pages.getRecords().get(j).getDeptId()){
+ String[] split = pages.getRecords().get(j).getDeptId().split(",");
+ List<String> list = Arrays.asList(split);
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
+ for (String deptId:list) {
+ for (DeptVo deptVo:deptVos) {
+ if (deptId.equals(deptVo.getId().toString())){
+ deptNameBuiffer.append(deptVo.getDeptName()).append(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ pages.getRecords().get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ }
+
return R.data(pages);
}
--
Gitblit v1.9.3