From 3cbc84c1dcc8980c00269f199f351cba2248bc4b Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Wed, 28 Apr 2021 09:40:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E5=92=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E5=AD=97=E5=85=B8=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BasePopulationInfoServiceImpl.java | 9 ++++-- .../impl/CommunityCorrectionServiceImpl.java | 30 ++++++++++++++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java b/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java index 6e0f231..f2ed11c 100644 --- a/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java +++ b/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java @@ -100,7 +100,10 @@ public class BasePopulationInfoServiceImpl extends AbstractService implements IB @Override public void saveBasePopulationInfoImport(Map dataObj) { String idCardNumber = dataObj.get("idCardNumber").toString().toLowerCase(); - if("".equals(idCardNumber) || 18 != idCardNumber.length()){ + if("".equals(idCardNumber)){ + throw new SaveException("身份证号码错误"); + } + if(15 != idCardNumber.length() && 18 != idCardNumber.length()){ throw new SaveException("身份证号码错误"); } Map queryMap = getHashMap(4); @@ -114,7 +117,9 @@ public class BasePopulationInfoServiceImpl extends AbstractService implements IB String year = idCardNumber.substring(6,10); String month = idCardNumber.substring(10,12); String day = idCardNumber.substring(12,14); - dataObj.put("birthDate",year + "-" + month + "-" + day); + if(15 != idCardNumber.length()){ + dataObj.put("birthDate",year + "-" + month + "-" + day); + } basePopulationInfoDao.saveBasePopulationInfo(dataObj); } } diff --git a/src/main/java/com/cm/population/service/communitycorrection/impl/CommunityCorrectionServiceImpl.java b/src/main/java/com/cm/population/service/communitycorrection/impl/CommunityCorrectionServiceImpl.java index 5cb189e..677d9c3 100644 --- a/src/main/java/com/cm/population/service/communitycorrection/impl/CommunityCorrectionServiceImpl.java +++ b/src/main/java/com/cm/population/service/communitycorrection/impl/CommunityCorrectionServiceImpl.java @@ -4,12 +4,15 @@ import com.cm.common.base.AbstractService; import com.cm.common.exception.RemoveException; import com.cm.common.exception.SaveException; import com.cm.common.exception.SearchException; +import com.cm.common.plugin.pojo.dtos.datadictionary.DataDictionaryDTO; +import com.cm.common.plugin.service.datadictionary.IDataDictionaryService; import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultData; import com.cm.common.result.SuccessResultList; import com.cm.common.utils.HashMapUtil; import com.cm.common.utils.UUIDUtil; +import com.cm.population.dao.basepopulationinfo.IBasePopulationInfoDao; import com.cm.population.dao.communitycorrection.ICommunityCorrectionDao; import com.cm.population.pojo.dtos.basepopulationinfo.BasePopulationInfoDTO; import com.cm.population.pojo.dtos.communitycorrection.CommunityCorrectionDTO; @@ -40,6 +43,11 @@ public class CommunityCorrectionServiceImpl extends AbstractService implements I @Autowired private IBasePopulationInfoService basePopulationInfoService; + @Autowired + private IBasePopulationInfoDao basePopulationInfoDao; + @Autowired + private IDataDictionaryService dataDictionaryService; + @Override public SuccessResult saveCommunityCorrection(CommunityCorrectionVO communityCorrectionVO) throws Exception { saveCommunityCorrectionInfo(null, communityCorrectionVO); @@ -184,12 +192,21 @@ public class CommunityCorrectionServiceImpl extends AbstractService implements I public CommunityCorrectionDTO getCommunityCorrectionById(String communityCorrectionId) throws SearchException { Map params = super.getHashMap(1); params.put("communityCorrectionId", communityCorrectionId); - return communityCorrectionDao.getCommunityCorrection(params); + CommunityCorrectionDTO dto = communityCorrectionDao.getCommunityCorrection(params); + if(dto != null){ + DataDictionaryDTO dictDto = dataDictionaryService.getDictionaryById(dto.getGender()); + dto.setGender(dictDto.getDictionaryName()); + } + return dto; } @Override public CommunityCorrectionDTO getCommunityCorrectionInfo(Map params) throws SearchException { CommunityCorrectionDTO dto = communityCorrectionDao.getCommunityCorrection(params); + if(dto != null){ + DataDictionaryDTO dictDto = dataDictionaryService.getDictionaryById(dto.getGender()); + dto.setGender(dictDto.getDictionaryName()); + } return dto == null ? new CommunityCorrectionDTO(): dto; } @@ -200,8 +217,19 @@ public class CommunityCorrectionServiceImpl extends AbstractService implements I @Override public SuccessResultList> listPageCommunityCorrection(ListPage page) throws SearchException { + //查询数据字典用于比对字典数据值 + List> dicList = basePopulationInfoDao.listDictionaryAll(); PageHelper.startPage(page.getPage(), page.getRows()); List communityCorrectionDTOs = communityCorrectionDao.listCommunityCorrection(page.getParams()); + for(CommunityCorrectionDTO item : communityCorrectionDTOs){ + for(Map dictItem : dicList){ + String dicId = dictItem.get("dictionary_id").toString(); + //性别 + if(dicId.equals(item.getGender())){ + item.setGender(dictItem.get("dictionary_name").toString()); + } + } + } PageInfo pageInfo = new PageInfo<>(communityCorrectionDTOs); return new SuccessResultList<>(communityCorrectionDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); }