From f9031d61c540a0d96b7338927a5ccef40bdc4e48 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 10:01:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9A=84=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E3=80=81=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B=E3=80=81=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E4=BA=BA=E7=BE=A4=E3=80=81=E4=BA=BA=E5=8F=A3=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C=E3=80=81?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=8E=B0=E5=B1=85=E4=BD=8F=E3=80=81=E6=88=B7?= =?UTF-8?q?=E5=88=AB,=E8=AF=95=E8=AF=95=E5=8F=AF=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index e0b5c91837..71dd1ada0c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/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 = null; + break; + case "/sys/dict/data/dictOption/yt_id_card_type": + optionTypeName = "证件类型"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_key_point_user_type": + optionTypeName = "重点人群"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_population_type": + optionTypeName = "人口类型"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_politics_status": + optionTypeName = "政治面貌"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_is_now_live": + optionTypeName = "是否现居住"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_household_category": + optionTypeName = "户别"; + options = null; + break; default: log.warn("listRemoteOptions url is not supported"); } - if (options == null) { return null; }