小区风控导出

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/FkqkController.java

@@ -86,6 +86,42 @@ public class FkqkController extends BaseController
             } else {
                 fkqkExport.setCommunity("");
             }
+            if (StringUtils.isNotEmpty(fkqkExport.getArea())) {
+                List<SysDictData> communities = DictUtils.getDictCache("residential_area");
+                List<String> labels = communities.stream().filter(i -> fkqkExport.getArea().equals(i.getDictValue()))
+                        .map(SysDictData::getDictLabel).collect(Collectors.toList());
+                if (!labels.isEmpty()) {
+                    fkqkExport.setArea(labels.get(0));
+                } else {
+                    fkqkExport.setArea("");
+                }
+            } else {
+                fkqkExport.setArea("");
+            }
+            if (StringUtils.isNotEmpty(fkqkExport.getStreet())) {
+                List<SysDictData> communities = DictUtils.getDictCache("street_town");
+                List<String> labels = communities.stream().filter(i -> fkqkExport.getStreet().equals(i.getDictValue()))
+                        .map(SysDictData::getDictLabel).collect(Collectors.toList());
+                if (!labels.isEmpty()) {
+                    fkqkExport.setStreet(labels.get(0));
+                } else {
+                    fkqkExport.setStreet("");
+                }
+            } else {
+                fkqkExport.setStreet("");
+            }
+            if (StringUtils.isNotEmpty(fkqkExport.getCommittee())) {
+                List<SysDictData> communities = DictUtils.getDictCache("committee");
+                List<String> labels = communities.stream().filter(i -> fkqkExport.getCommittee().equals(i.getDictValue()))
+                        .map(SysDictData::getDictLabel).collect(Collectors.toList());
+                if (!labels.isEmpty()) {
+                    fkqkExport.setCommittee(labels.get(0));
+                } else {
+                    fkqkExport.setCommittee("");
+                }
+            } else {
+                fkqkExport.setCommittee("");
+            }
         }
         util.exportExcel(response, list, "小区封控情况数据");
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/Fkqk.java

@@ -25,14 +25,14 @@ public class Fkqk extends BaseEntity
     private String community;
 
     /** 所在区 */
-    @Excel(name = "所在区", dictType = "residential_area")
+    @Excel(name = "所在区")
     private String area;
 
     /** 街道/镇名称 */
-    @Excel(name = "街道/镇名称", dictType = "street_town")
+    @Excel(name = "街道/镇名称")
     private String street;
 
-    @Excel(name = "居委会", dictType = "committee")
+    @Excel(name = "居委会")
     private String committee;
 
     /** 楼号 */