Merge remote-tracking branch 'origin/master' into master

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

@@ -77,6 +77,30 @@ public class YcsbController extends BaseController
             } else {
                 ycsbExport.setCommunity("");
             }
+            if (StringUtils.isNotEmpty(ycsbExport.getCommittee())) {
+                List<SysDictData> committees = DictUtils.getDictCache("committee");
+                List<String> labels = committees.stream().filter(i -> ycsbExport.getCommittee().equals(i.getDictValue()))
+                        .map(SysDictData::getDictLabel).collect(Collectors.toList());
+                if (!labels.isEmpty()) {
+                    ycsbExport.setCommittee(labels.get(0));
+                } else {
+                    ycsbExport.setCommittee("");
+                }
+            } else {
+                ycsbExport.setCommittee("");
+            }
+            if (StringUtils.isNotEmpty(ycsbExport.getStreet())) {
+                List<SysDictData> streetTown = DictUtils.getDictCache("street_town");
+                List<String> labels = streetTown.stream().filter(i -> ycsbExport.getStreet().equals(i.getDictValue()))
+                        .map(SysDictData::getDictLabel).collect(Collectors.toList());
+                if (!labels.isEmpty()) {
+                    ycsbExport.setStreet(labels.get(0));
+                } else {
+                    ycsbExport.setStreet("");
+                }
+            } else {
+                ycsbExport.setStreet("");
+            }
         }
         util.exportExcel(response, list, "抗原异常上报数据");
     }