修改返回数据字典label值

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YxryServiceImpl.java

@@ -141,45 +141,45 @@ public class YxryServiceImpl implements IYxryService {
         List<Yxry> updateList = new ArrayList<>();
         for (Yxry zlqk : list) {
             if (StringUtils.isNotEmpty(zlqk.getCardNo()) && StringUtils.isNotEmpty(zlqk.getUserName())
-                    && StringUtils.isNotEmpty(zlqk.getPhone()) && StringUtils.isNotEmpty(zlqk.getArea()) ) {
+                    && StringUtils.isNotEmpty(zlqk.getPhone()) && StringUtils.isNotEmpty(zlqk.getArea())) {
                 String community = "";
                 String committee = "";
                 String street = "";
-                if (StringUtils.isNotEmpty(zlqk.getCommunity())){ //如果小区不为空，去数据字典匹配value
+                if (StringUtils.isNotEmpty(zlqk.getCommunity())) { //如果小区不为空，去数据字典匹配value
                     List<SysDictData> communitys = DictUtils.getDictCache("community");
-                    List<String> values = communitys.stream().filter(l->zlqk.getCommunity().equals(l.getDictLabel()))
+                    List<String> values = communitys.stream().filter(l -> zlqk.getCommunity().equals(l.getDictLabel()))
                             .map(SysDictData::getDictValue).collect(Collectors.toList());
                     if (!values.isEmpty())
-                        community=values.get(0);
+                        community = values.get(0);
                     else {
                         failureList.add(zlqk);
                         continue;
                     }
                 }
-                if (StringUtils.isNotEmpty(zlqk.getCommittee())){ //如果委员会不为空，去数据字典匹配value
+                if (StringUtils.isNotEmpty(zlqk.getCommittee())) { //如果委员会不为空，去数据字典匹配value
                     List<SysDictData> communitys = DictUtils.getDictCache("committee");
-                    List<String> values = communitys.stream().filter(l->zlqk.getCommittee().equals(l.getDictLabel()))
+                    List<String> values = communitys.stream().filter(l -> zlqk.getCommittee().equals(l.getDictLabel()))
                             .map(SysDictData::getDictValue).collect(Collectors.toList());
                     if (!values.isEmpty())
-                        committee=values.get(0);
+                        committee = values.get(0);
                     else {
                         failureList.add(zlqk);
                         continue;
                     }
                 }
-                if (StringUtils.isNotEmpty(zlqk.getStreet())){ //如果街道不为空，去数据字典匹配value
+                if (StringUtils.isNotEmpty(zlqk.getStreet())) { //如果街道不为空，去数据字典匹配value
                     List<SysDictData> communitys = DictUtils.getDictCache("street_town");
-                    List<String> values = communitys.stream().filter(l->zlqk.getStreet().equals(l.getDictLabel()))
+                    List<String> values = communitys.stream().filter(l -> zlqk.getStreet().equals(l.getDictLabel()))
                             .map(SysDictData::getDictValue).collect(Collectors.toList());
                     if (!values.isEmpty())
-                        street=values.get(0);
+                        street = values.get(0);
                     else {
                         failureList.add(zlqk);
                         continue;
                     }
                 }
-                if ((StringUtils.isNotEmpty(community)&&StringUtils.isEmpty(committee))||
-                        (StringUtils.isNotEmpty(committee)&&StringUtils.isEmpty(street))){
+                if ((StringUtils.isNotEmpty(community) && StringUtils.isEmpty(committee)) ||
+                        (StringUtils.isNotEmpty(committee) && StringUtils.isEmpty(street))) {
                     failureList.add(zlqk);
                     continue;
                 }
@@ -198,7 +198,7 @@ public class YxryServiceImpl implements IYxryService {
                         if (!CheckUtils.checkPhone(zlqk.getPhone())) {
                             failureList.add(zlqk);
                         } else {
-                            if (CheckUtils.checkCard(zlqk.getCardNo())){
+                            if (CheckUtils.checkCard(zlqk.getCardNo())) {
                                 zlqk.setCheckCard("正确");
                                 zlqk.setCommunity(community);
                                 zlqk.setCommittee(committee);
@@ -270,18 +270,18 @@ public class YxryServiceImpl implements IYxryService {
             map.put("glName", null);
         } else if (fcryList.size() > 0 && gldryList.size() > 0) { // 都没转出
             map.put("glPlace", "其他");
-            map.put("fcName", fcryList.stream().map(Fcry::getFcPlace).collect(Collectors.joining(",")));
-            map.put("glName", gldryList.stream().map(Gldry::getGlPlace).collect(Collectors.joining(",")));
+            map.put("fcName", DictUtils.getDictLabel("shelters",fcryList.stream().map(Fcry::getFcPlace).collect(Collectors.joining(","))));
+            map.put("glName", DictUtils.getDictLabel("isolation_point",gldryList.stream().map(Gldry::getGlPlace).collect(Collectors.joining(","))));
         } else if (fcryList.size() > 0) {
             map.put("glPlace", "方舱隔离");
-            map.put("fcName", fcryList.stream().map(Fcry::getFcPlace).collect(Collectors.joining(",")));
+            map.put("fcName", DictUtils.getDictLabel("shelters",fcryList.stream().map(Fcry::getFcPlace).collect(Collectors.joining(","))));
             map.put("glName", null);
         } else {
             map.put("glPlace", "隔离点隔离");
             map.put("fcName", null);
-            map.put("glName", gldryList.stream().map(Gldry::getGlPlace).collect(Collectors.joining(",")));
+            map.put("glName", DictUtils.getDictLabel("isolation_point",gldryList.stream().map(Gldry::getGlPlace).collect(Collectors.joining(","))));
         }
-        map.put("card",zlqks.isEmpty());
+        map.put("card", zlqks.isEmpty());
         return map;
     }
 }