wyyay пре 2 година
родитељ
комит
c7cbde68f8

+ 2 - 1
src/main/java/com/iden/bms/service/FaceImageService.java

@@ -10,6 +10,7 @@ import com.iden.common.entity.IdenCrowd;
 import com.iden.common.entity.IdenFaceImage;
 import com.iden.common.entity.IdenPerson;
 import com.iden.common.entity.IdenPersonCrowdRef;
+import com.iden.common.enums.MarriageEnum;
 import com.iden.common.enums.PersonTypeEnum;
 import com.iden.common.enums.PopulationTypeEnum;
 import com.iden.common.service.IdenCrowdService;
@@ -98,7 +99,7 @@ public class FaceImageService {
                     BeanUtil.copyProperties(idenPerson,personVO);
                     personVO.setPopulationTypeName(PopulationTypeEnum.getValueToName(personVO.getPopulationType()));
                     personVO.setTypeName(PersonTypeEnum.getValueToName(personVO.getType()));
-                    personVO.setMarriageName(PersonTypeEnum.getValueToName(personVO.getMarriage()));
+                    personVO.setMarriageName(MarriageEnum.getValueToName(personVO.getMarriage()));
 
                     QueryWrapper<IdenPersonCrowdRef> queryWrapper1 = new QueryWrapper<>();
                     queryWrapper1.lambda().eq(IdenPersonCrowdRef::getPersonId,personVO.getId());

+ 56 - 0
src/main/java/com/iden/common/enums/MarriageEnum.java

@@ -0,0 +1,56 @@
+package com.iden.common.enums;
+
+import cn.hutool.core.util.StrUtil;
+
+/**
+ * @author wyy
+ * @subject
+ * @creat 2023/2/19
+ */
+public enum MarriageEnum {
+    /**
+     * 婚姻状态
+     */
+    MARRIED("0","已婚"),
+    UNMARRIED("1","未婚");
+    private String value;
+    private String name;
+
+    MarriageEnum(String value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+    public String getValue() {
+        return value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static String getValueToName(String value){
+        if (StrUtil.isEmpty(value)){
+            return null;
+        }
+        if (MARRIED.getValue().equals(value)){
+            return  MARRIED.name;
+        }else if (UNMARRIED.getValue().equals(value)){
+            return  UNMARRIED.name;
+        }
+
+        return null;
+    }
+
+    public static String getNameToValue(String name){
+        if (StrUtil.isEmpty(name)){
+            return null;
+        }
+        if (MARRIED.getName().equals(name)){
+            return  MARRIED.value;
+        }else if (UNMARRIED.getName().equals(name)){
+            return  UNMARRIED.value;
+        }
+
+        return null;
+    }
+}