Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master'

epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java

@@ -105,4 +105,13 @@ public interface EpmetAdminOpenFeignClient {
 
     @PostMapping("/sys/dict/data/dictDataList/{dictType}")
     Result<List<SysDictDataDTO>> dictDataList(@PathVariable("dictType") String dictType);
+
+    /**
+     * 字典下拉框
+     * 根据dictType查询字典
+     * @param dictType
+     * @return
+     */
+    @PostMapping("/sys/dict/data/dictOption/{dictType}")
+    public Result<List<OptionResultDTO>> getDictOption(@PathVariable("dictType")String dictType);
 }

epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java

@@ -65,4 +65,16 @@ public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignCli
     public Result<List<SysDictDataDTO>> dictDataList(String dictType) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictDataList", dictType);
     }
+
+    /**
+     * 字典下拉框
+     * 根据dictType查询字典
+     *
+     * @param dictType
+     * @return
+     */
+    @Override
+    public Result<List<OptionResultDTO>> getDictOption(String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "getDictOption", dictType);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -6,7 +6,6 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcelFactory;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.bean.ResiImportCategoryData;
@@ -1457,11 +1456,38 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 optionTypeName = "所属支部";
                 options = this.listBranchOptions();
                 break;
+            case "/sys/dict/data/dictOption/yt_Householder_relationship_type":
+                optionTypeName = "与户主关系";
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_Householder_relationship_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
+                break;
+            case "/sys/dict/data/dictOption/yt_id_card_type":
+                optionTypeName = "证件类型";
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_id_card_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
+                break;
+            case "/sys/dict/data/dictOption/yt_key_point_user_type":
+                optionTypeName = "重点人群";
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_key_point_user_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
+                break;
+            case "/sys/dict/data/dictOption/yt_population_type":
+                optionTypeName = "人口类型";
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_population_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
+                break;
+            case "/sys/dict/data/dictOption/yt_politics_status":
+                optionTypeName = "政治面貌";
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_politics_status"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
+                break;
+            case "/sys/dict/data/dictOption/yt_is_now_live":
+                optionTypeName = "是否现居住";
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_is_now_live"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
+                break;
+            case "/sys/dict/data/dictOption/yt_household_category":
+                optionTypeName = "户别";
+                options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_household_category"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
+                break;
             default:
                 log.warn("listRemoteOptions url is not supported");
 
         }
-
         if (options == null) {
             return null;
         }