小区导入

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

@@ -128,12 +128,12 @@ public class FkqkServiceImpl implements IFkqkService
         List<Fkqk> trueList = new ArrayList<>();
         List<Fkqk> failureList = new ArrayList<>();
         for (Fkqk fkqk : residentialList){
-            if (StringUtils.isNotEmpty(fkqk.getStreet()) && StringUtils.isNotEmpty(fkqk.getCommunity())
-            && StringUtils.isNotEmpty(fkqk.getFkHs()) && StringUtils.isNotEmpty(fkqk.getFkRs())
-            && fkqk.getFkTime() != null){
+            if (StringUtils.isNotEmpty(fkqk.getArea()) && StringUtils.isNotEmpty(fkqk.getFkHs())
+                    && StringUtils.isNotEmpty(fkqk.getFkRs()) && fkqk.getFkTime() != null){
                 String communityValue = "";
                 String committeeValue = "";
                 String streetValue = "";
+                String areaValue = "";
                 Date now;
                 Calendar c = Calendar.getInstance();
                 now = new Date(c.get(Calendar.YEAR), c.get(Calendar.MONTH) + 1, c.get(Calendar.DAY_OF_MONTH));
@@ -178,7 +178,7 @@ public class FkqkServiceImpl implements IFkqkService
                     List<String> values = area.stream().filter(l->fkqk.getArea().equals(l.getDictLabel()))
                             .map(SysDictData::getDictValue).collect(Collectors.toList());
                     if (!values.isEmpty())
-                        fkqk.setArea(values.get(0));
+                    areaValue = values.get(0);
                     else {
                         failureList.add(fkqk);
                         continue;
@@ -203,6 +203,7 @@ public class FkqkServiceImpl implements IFkqkService
                     fkqk.setCommunity(communityValue);
                     fkqk.setCommittee(committeeValue);
                     fkqk.setStreet(streetValue);
+                    fkqk.setArea(areaValue);
 //                    fkqk.setStreet(sysDictDataHave.get(0).getDictValue());
                     fkqk.setCreateBy(createBy);
                     fkqk.setCreateTime(DateUtils.getNowDate());

ruoyi-ui/src/views/system/fkqk/index.vue

@@ -1002,6 +1002,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.area = '1'
       this.open = true;
       this.title = "添加小区封控情况";
     },