From d6e86197a5a857c697465fb97a488c7327c9cb3b Mon Sep 17 00:00:00 2001 From: xyh <18782104331@139.com> Date: 星期一, 14 六月 2021 22:42:21 +0800 Subject: [PATCH] 家庭关系拦截判断 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 141 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 102 insertions(+), 39 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java index e0b179d..38d49da 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java @@ -168,27 +168,8 @@ vo.setIsRent(isOk); } if(StringUtils.isNotEmpty(oneData.get(5))){ - String ra = oneData.get(5); - if(Objects.equals(ra,"女儿")){ - ra = "女"; - }else if(Objects.equals(ra,"儿子")){ - ra = "子"; - }else if(Objects.equals(ra,"大女")){ - ra = "长女"; - }else if(Objects.equals(ra,"二女")){ - ra = "次女"; - }else if(Objects.equals(ra,"非亲属")){ - ra = "其他"; - }else if(Objects.equals(ra,"姐")){ - ra = "姐姐"; - }else if(Objects.equals(ra,"户主")){ - ra = "本人"; - }else if(Objects.equals(ra,"妻子")){ - ra = "妻"; - }else if(Objects.equals(ra,"哥") || Objects.equals(ra,"哥哥")){ - ra = "兄"; - } + String ra = convertRelation(oneData.get(5)); String relation = dictMap.get(ra); if(StringUtils.isEmpty(relation)){ @@ -302,25 +283,7 @@ vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(18))); } if(StringUtils.isNotEmpty(oneData.get(19))){ - String ma = oneData.get(19); - - if(Objects.equals("已",ma)){ - ma = "已婚"; - }else if(Objects.equals("未",ma)){ - ma = "未婚"; - }else if(Objects.equals("初",ma)){ - ma = "初婚"; - }else if(Objects.equals("再",ma)){ - ma = "再婚"; - }else if(Objects.equals("复",ma)){ - ma = "复婚"; - }else if(Objects.equals("丧",ma)){ - ma = "丧偶"; - }else if(Objects.equals("离",ma)){ - ma = "离婚"; - }else if(Objects.equals("分",ma)){ - ma = "分居"; - } + String ma = convertMarriage(oneData.get(19)); Integer isOk = PopulMarriageEnum.getCodeByName(ma); if(isOk.equals(-1)){ vo.setMarriageStr(ma); @@ -422,4 +385,104 @@ throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList)); } } + + private String convertMarriage(String ma) { + + if(Objects.equals("已",ma) || Objects.equals("一",ma)){ + ma = "已婚"; + }else if(Objects.equals("未",ma) || Objects.equals("未婚婚",ma)){ + ma = "未婚"; + }else if(Objects.equals("初",ma)){ + ma = "初婚"; + }else if(Objects.equals("再",ma)){ + ma = "再婚"; + }else if(Objects.equals("复",ma)){ + ma = "复婚"; + }else if(Objects.equals("丧",ma) || Objects.equals("丧偶偶",ma)){ + ma = "丧偶"; + }else if(Objects.equals("离",ma) || Objects.equals("离异",ma) || Objects.equals("离异婚",ma)){ + ma = "离婚"; + }else if(Objects.equals("分",ma)){ + ma = "分居"; + } + + return ma; + } + + private String convertRelation(String ra) { + if(ra.contains("户主")){ + ra = "户主"; + }else if(Objects.equals(ra,"女儿")){ + ra = "女"; + }else if(Objects.equals(ra,"儿子") || Objects.equals(ra,"儿")){ + ra = "子"; + }else if(Objects.equals(ra,"大女")){ + ra = "长女"; + }else if(Objects.equals(ra,"二女") || Objects.equals(ra,"此女")){ + ra = "次女"; + }else if(Objects.equals(ra,"二子")){ + ra = "次子"; + }else if(Objects.equals(ra,"长男") || ra.contains("长子")){ + ra = "长子"; + }else if(Objects.equals(ra,"非亲属") || ra.contains("女友") || ra.contains("女朋友") + || ra.contains("男友") || ra.contains("男朋友")){ + ra = "其他"; + }else if(Objects.equals(ra,"姐")){ + ra = "姐姐"; + }else if(Objects.equals(ra,"户主")){ + ra = "本人"; + }else if(Objects.equals(ra,"妻子") || Objects.equals(ra,"媳妇")){ + ra = "妻"; + }else if(Objects.equals(ra,"哥") || Objects.equals(ra,"哥哥")){ + ra = "兄"; + }else if(Objects.equals(ra,"丈夫")){ + ra = "夫"; + }else if(Objects.equals(ra,"丈母娘")){ + ra = "岳母"; + }else if(Objects.equals(ra,"继子") || Objects.equals(ra,"养子")){ + ra = "养子或继子"; + }else if(Objects.equals(ra,"继女") || Objects.equals(ra,"养女")){ + ra = "养女或继女"; + }else if(ra.contains("儿媳")||ra.contains("长媳")){ + ra = "儿媳"; + }else if(Objects.equals(ra,"三姨") || Objects.equals(ra,"姨姨")){ + ra = "姨母"; + }else if(Objects.equals(ra,"二外孙女")){ + ra = "外孙女"; + }else if(Objects.equals(ra,"外孙")){ + ra = "外孙子"; + }else if(Objects.equals(ra,"侄儿")){ + ra = "侄子"; + }else if(ra.contains("表")){ + ra = "表兄弟、表姐妹"; + }else if(Objects.equals(ra,"继父") || Objects.equals(ra,"养父")){ + ra = "继父或养父"; + }else if(Objects.equals(ra,"父")){ + ra = "父亲"; + }else if(Objects.equals(ra,"弟弟")){ + ra = "弟"; + }else if(Objects.equals(ra,"孙")){ + ra = "孙子"; + }else if(Objects.equals(ra,"孙媳妇") || Objects.equals(ra,"外孙媳妇")){ + ra = "孙媳妇或外孙媳妇"; + }else if(Objects.equals(ra,"妹")){ + ra = "妹妹"; + }else if(Objects.equals(ra,"祖父母")){ + ra = "祖父母或外祖父母"; + }else if(Objects.equals(ra,"姐妹") || Objects.equals(ra,"兄弟")){ + ra = "兄弟姐妹"; + }else if(Objects.equals(ra,"其他姐妹") || Objects.equals(ra,"其他兄弟")){ + ra = "其他兄弟姐妹"; + }else if(Objects.equals(ra,"奶奶")){ + ra = "祖母"; + }else if(Objects.equals(ra,"爷爷")){ + ra = "祖父"; + }else if(Objects.equals(ra,"爷爷")){ + ra = "祖父"; + }else if(ra.contains("堂")){ + ra = "堂兄弟、堂姐妹"; + } + + return ra; + } } -- Gitblit v1.7.1