修改 核算采集导出

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

@@ -66,6 +66,7 @@ public class HscjController extends BaseController
         List<SysDictData> community = DictUtils.getDictCache("community");
         List<SysDictData> committee = DictUtils.getDictCache("committee");
         List<SysDictData> street = DictUtils.getDictCache("street_town");
+        List<SysDictData> area = DictUtils.getDictCache("residential_area");
         for (Hscj yxry1 : list) {
             if (StringUtils.isNotEmpty(yxry1.getCommunity())) {
                 List<String> labels = community.stream().filter(l -> yxry1.getCommunity().equals(l.getDictValue()))
@@ -85,6 +86,12 @@ public class HscjController extends BaseController
                 if (!labels.isEmpty())
                     yxry1.setStreet(labels.get(0));
             }
+            if (StringUtils.isNotEmpty(yxry1.getArea())) {
+                List<String> labels = area.stream().filter(l -> yxry1.getArea().equals(l.getDictValue()))
+                        .map(SysDictData::getDictLabel).collect(Collectors.toList());
+                if (!labels.isEmpty())
+                    yxry1.setArea(labels.get(0));
+            }
         }
         ExcelUtil<Hscj> util = new ExcelUtil<Hscj>(Hscj.class);
         util.exportExcel(response, list, "核酸采集数据");