小区封控，方舱人员管理

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

@@ -131,6 +131,10 @@ public class FcryController extends BaseController
         List<String> areaList = fkqkService.selectArea();
         String[] area = areaList.toArray(new String[]{});
         ExcelUtil.setClassExcelAttribute( clazz,"area","combo",area);
+
+        List<String> fcList = fkqkService.selectFc();
+        String[] fc = fcList.toArray(new String[]{});
+        ExcelUtil.setClassExcelAttribute( clazz,"fcPlace","combo",fc);
         util.importTemplateExcel(response, "方舱人员导入模板");
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/FcryDTO.java

@@ -22,7 +22,7 @@ public class FcryDTO extends BaseEntity
         private Long id;
 
         /** 方舱名称 */
-        @Excel(name = "方舱名称")
+        @Excel(name = "方舱名称",dictType = "fcPlace",combo = "")
         private String fcPlace;
 
         /** 房间号 */

ruoyi-system/src/main/java/com/ruoyi/system/mapper/FkqkMapper.java

@@ -64,4 +64,5 @@ public interface FkqkMapper
 
     List<String> selectStreet();
     List<String> selectArea();
+    List<String> selectFc();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IFkqkService.java

@@ -65,4 +65,5 @@ public interface IFkqkService
 
     List<String> selectStreet();
     List<String> selectArea();
+    List<String> selectFc();
 }

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.CheckUtils;
 import com.ruoyi.common.utils.DateUtils;
@@ -12,6 +13,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.FcryDTO;
 import com.ruoyi.system.domain.Fkqk;
 import com.ruoyi.system.domain.Zlqk;
+import com.ruoyi.system.mapper.SysDictDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -33,6 +35,8 @@ public class FcryServiceImpl implements IFcryService
 {
     @Autowired
     private FcryMapper fcryMapper;
+    @Autowired
+    private SysDictDataMapper sysDictDataMapper;
 
     /**
      * 查询方舱人员
@@ -132,11 +136,33 @@ public class FcryServiceImpl implements IFcryService
                     if (fcrys.size()>1)
                         failureList.add(fcry);
                     else {
-                        if (CheckUtils.checkCard(fcry.getCardNo()))
-                            fcry.setCheckCard("正确");
-                        else
-                            fcry.setCheckCard("不正确");
-                        trueList.add(fcry);
+                        // 查询街道/镇名称是否在字典中
+                        SysDictData sysDictData = new SysDictData();
+                        sysDictData.setStatus("0");
+                        sysDictData.setDictLabel(fcry.getStreet());
+                        sysDictData.setDictType("street_town");
+                        List<SysDictData> sysDictDataHave = sysDictDataMapper.selectDictDataList(sysDictData);
+                        if (sysDictDataHave.isEmpty()){
+                            failureList.add(fcry);
+                        }else {
+                            // 查询方舱名称是否在字典中
+                            SysDictData sysDictDataFc = new SysDictData();
+                            sysDictData.setStatus("0");
+                            sysDictData.setDictLabel(fcry.getFcPlace());
+                            sysDictData.setDictType("shelter_name");
+                            List<SysDictData> sysDictDataFcHave = sysDictDataMapper.selectDictDataList(sysDictData);
+                            if (sysDictDataFcHave.isEmpty()){
+                                failureList.add(fcry);
+                            }else {
+                                fcry.setStreet(sysDictDataHave.get(0).getDictValue());
+                                fcry.setFcPlace(sysDictDataFcHave.get(0).getDictValue());
+                                if (CheckUtils.checkCard(fcry.getCardNo()))
+                                    fcry.setCheckCard("正确");
+                                else
+                                    fcry.setCheckCard("不正确");
+                                trueList.add(fcry);
+                            }
+                        }
                     }
                 }
             }else {

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

@@ -147,6 +147,7 @@ public class FkqkServiceImpl implements IFkqkService
                 }else if (fkqk.getRemark().length() > 200){
                     failureList.add(fkqk);
                 }else {
+                    fkqk.setStreet(sysDictDataHave.get(0).getDictValue());
                     fkqk.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
                     fkqk.setCreateTime(DateUtils.getNowDate());
                     trueList.add(fkqk);
@@ -178,4 +179,9 @@ public class FkqkServiceImpl implements IFkqkService
         List<String> stringList = fkqkMapper.selectArea();
         return stringList;
     }
+    @Override
+    public List<String> selectFc() {
+        List<String> stringList = fkqkMapper.selectFc();
+        return stringList;
+    }
 }

ruoyi-system/src/main/resources/mapper/system/FkqkMapper.xml

@@ -52,6 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM sys_dict_data
         WHERE dict_type = 'residential_area' AND status = '0'
     </select>
+    <select id="selectFc" resultType="java.lang.String">
+        SELECT DISTINCT dict_label
+        FROM sys_dict_data
+        WHERE dict_type = 'shelter_name' AND status = '0'
+    </select>
     <insert id="insertFkqk" parameterType="Fkqk" useGeneratedKeys="true" keyProperty="id">
         insert into fkqk
         <trim prefix="(" suffix=")" suffixOverrides=",">