修改 方舱导入

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

@@ -169,11 +169,11 @@ public class FcryServiceImpl implements IFcryService
                             .map(SysDictData::getDictValue).collect(Collectors.toList());
                     if (!values.isEmpty())
                         communityValue = values.get(0);
-                    else {
-                        fcry.setFailure("小区不存在");
-                        failureList.add(fcry);
-                        continue;
-                    }
+//                    else {
+//                        fcry.setFailure("小区不存在");
+//                        failureList.add(fcry);
+//                        continue;
+//                    }
                 }
                 if (StringUtils.isNotEmpty(fcry.getCommittee())){ //如果居委会不为空，去数据字典匹配value
                     List<SysDictData> committee = DictUtils.getDictCache("committee");
@@ -182,9 +182,11 @@ public class FcryServiceImpl implements IFcryService
                     if (!values.isEmpty())
                         committeeValue=values.get(0);
                     else {
-                        fcry.setFailure("居委会不存在");
-                        failureList.add(fcry);
-                        continue;
+                        committeeValue = "";
+                        communityValue = "";
+//                        fcry.setFailure("居委会不存在");
+//                        failureList.add(fcry);
+//                        continue;
                     }
                 }
                 if (StringUtils.isNotEmpty(fcry.getStreet())){ //如果街道镇不为空，去数据字典匹配value
@@ -194,9 +196,12 @@ public class FcryServiceImpl implements IFcryService
                     if (!values.isEmpty())
                         streetValue=values.get(0);
                     else {
-                        fcry.setFailure("街道不存在");
-                        failureList.add(fcry);
-                        continue;
+                        committeeValue = "";
+                        communityValue = "";
+                        streetValue = "";
+//                        fcry.setFailure("街道不存在");
+//                        failureList.add(fcry);
+//                        continue;
                     }
                 }
                 if (StringUtils.isNotEmpty(fcry.getArea())){ //如果区不为空，去数据字典匹配value
@@ -223,12 +228,12 @@ public class FcryServiceImpl implements IFcryService
                         continue;
                     }
                 }
-                if ((StringUtils.isNotEmpty(fcry.getCommunity())&&StringUtils.isEmpty(fcry.getCommittee()))||
-                        (StringUtils.isNotEmpty(fcry.getCommittee())&&StringUtils.isEmpty(fcry.getStreet()))){
-                    fcry.setFailure("街道或居委会不存在");
-                    failureList.add(fcry);
-                    continue;
-                }
+//                if ((StringUtils.isNotEmpty(fcry.getCommunity())&&StringUtils.isEmpty(fcry.getCommittee()))||
+//                        (StringUtils.isNotEmpty(fcry.getCommittee())&&StringUtils.isEmpty(fcry.getStreet()))){
+//                    fcry.setFailure("街道或居委会不存在");
+//                    failureList.add(fcry);
+//                    continue;
+//                }
                 List<Fcry> fcrys = fcryMapper.selectFcryByCard(fcry.getCardNo());
                 if (!fcrys.isEmpty()){
                     fcry.setCommunity(communityValue);