|
|
@@ -6,11 +6,11 @@ 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.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;
|
|
|
@@ -99,7 +99,8 @@ public class FaceImageService {
|
|
|
BeanUtil.copyProperties(idenPerson,personVO);
|
|
|
personVO.setPopulationTypeName(PopulationTypeEnum.getValueToName(personVO.getPopulationType()));
|
|
|
personVO.setTypeName(PersonTypeEnum.getValueToName(personVO.getType()));
|
|
|
- personVO.setMarriageName(MarriageEnum.getValueToName(personVO.getMarriage()));
|
|
|
+ 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());
|
wyyay