转义婚姻字段

src/main/java/com/iden/bms/service/WarningPersonService.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.iden.common.cache.DictCache;
 import com.iden.common.entity.*;
 import com.iden.common.enums.*;
 import com.iden.common.exception.BDException;
@@ -109,7 +110,10 @@ public class WarningPersonService {
                     BeanUtils.copyProperties(idenPerson,personVO);
                     personVO.setPopulationTypeName(PopulationTypeEnum.getValueToName(personVO.getPopulationType()));
                     personVO.setTypeName(PersonTypeEnum.getValueToName(personVO.getType()));
-
+                    personVO.setGenderName(GenderEnum.getValueToName(personVO.getGender()));
+                    personVO.setCredentialsTypeName(CredentialsTypeEnum.getValueToName(personVO.getCredentialsType()));
+                    personVO.setMarriageName(DictCache.getNameByValue("marriage", personVO.getMarriage()));
+                    personVO.setPolicitalStatusName(DictCache.getNameByValue("policital_status", personVO.getPolicitalStatus()));
                     QueryWrapper<IdenPersonCrowdRef> queryWrapper1 = new QueryWrapper<>();
                     queryWrapper1.lambda().eq(IdenPersonCrowdRef::getPersonId,personVO.getId());
                     List<IdenPersonCrowdRef> listIdenPersonCrowdRef = idenPersonCrowdRefService.list(queryWrapper1);

src/main/java/com/iden/common/enums/MarriageEnum.java

@@ -1,56 +0,0 @@
-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;
-    }
-}