人户状况

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java

@@ -25,5 +25,10 @@ public class OwnerRelationResultDTO implements Serializable {
         private String userName;
         private String isSelf;
         private String relation;
+
+        /**
+         * 人户状况
+         */
+        private String renHuCondition;
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java

@@ -0,0 +1,52 @@
+package com.epmet.enums;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum RenHuConditionEnum {
+
+    /**
+     * 人户一致，人在户不在，户在人不在，
+     * 为空的 暂不清楚
+     */
+    RHYZ("rhyz","人户一致"),
+    RZHBZ("rzhbz","人在户不在"),
+    HZRBZ("hzrbz","户在人不在"),
+    ZBQC("","暂不清楚"),
+    ;
+
+    private String code;
+    private String name;
+
+    public static String getNameByCode(String code){
+        if (StringUtils.isBlank(code)){
+            return ZBQC.name;
+        }
+        for (RenHuConditionEnum e : values()) {
+            if (e.getCode().equals(code)){
+                return e.getName();
+            }
+        }
+        return ZBQC.name;
+    }
+
+    RenHuConditionEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -63,6 +63,7 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO;
 import com.epmet.entity.*;
+import com.epmet.enums.RenHuConditionEnum;
 import com.epmet.excel.EpidemicPreventionExportExcel;
 import com.epmet.excel.support.ExportResiUserItemDTO;
 import com.epmet.feign.*;
@@ -1478,6 +1479,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) {
                         result.setOwnerName(item.getName());
                     }
+                    if (StringUtils.isBlank(item.getRhzk())){
+                        bean.setRenHuCondition(RenHuConditionEnum.ZBQC.getName());
+                    }else {
+                        bean.setRenHuCondition(RenHuConditionEnum.getNameByCode(item.getRhzk()));
+                    }
                     return bean;
                 }).collect(Collectors.toList());
                 result.setUserList(userList);