From e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 十一月 2021 17:04:46 +0800
Subject: [PATCH] 1109修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java | 70 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
index 92cb759..b558e8d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
@@ -17,6 +17,7 @@
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
+import com.panzhihua.service_community.service.ComElderAuthElderliesService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -84,6 +85,8 @@
private ComPensionAuthRecordDAO comPensionAuthRecordDAO;
@Resource
private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;
+ @Resource
+ private ComElderAuthElderliesService comElderAuthElderliesService;
@Override
public R pageElderAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -150,6 +153,9 @@
if (comElderAuthRecordVO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) {
comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz);
sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", "认证成功！");
+
+ authElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
+ comElderAuthElderliesDAO.updateById(authElderliesDO);
} else {
sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason());
}
@@ -212,7 +218,10 @@
List<ComElderAuthRecordsDO> saveList = new ArrayList<>();
// 需要修改的认证记录集合
List<ComElderAuthRecordsDO> updateList = new ArrayList<>();
+ //需要更新的老人信息
+ List<ComElderAuthElderliesDO> updateElderliesList = new ArrayList<>();
log.info("开始处理导入数据");
+
List<ComElderAuthRecordImportMistakeExcelVO> mistakes = new ArrayList<>();
try {
@@ -272,15 +281,30 @@
}else if (comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.dsh)) {
comElderAuthRecordsDO = updateElderAuthRecordsDO(vo, comElderAuthRecordsDO,userId,communityId,nowDate);
updateList.add(comElderAuthRecordsDO);
+
+ if(StringUtils.isNotEmpty(vo.getAddress())){
+ comElderAuthElderliesDO.setAddress(vo.getAddress());
+ updateElderliesList.add(comElderAuthElderliesDO);
+ }
}else {
// 驳回状态,则新增
comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId,nowDate);
saveList.add(comElderAuthRecordsDO);
+
+ if(StringUtils.isNotEmpty(vo.getAddress())){
+ comElderAuthElderliesDO.setAddress(vo.getAddress());
+ updateElderliesList.add(comElderAuthElderliesDO);
+ }
}
}else {
// 不存在记录,则新增
comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId,nowDate);
saveList.add(comElderAuthRecordsDO);
+
+ if(StringUtils.isNotEmpty(vo.getAddress())){
+ comElderAuthElderliesDO.setAddress(vo.getAddress());
+ updateElderliesList.add(comElderAuthElderliesDO);
+ }
}
}
}
@@ -310,6 +334,9 @@
log.info("执行数据库更新线下认证记录");
comElderAuthRecordsDAO.updateAll(updateList);
log.info("数据库更新线下认证记录完成");
+ }
+ if(!updateElderliesList.isEmpty()){
+ comElderAuthElderliesService.updateBatchById(updateElderliesList);
}
log.info("执行数据库导入完成");
@@ -354,8 +381,10 @@
//查询老人信息
ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
if(authElderliesDO != null){
+ Long authId = authHistoryRecordDO.getId();
BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
- authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderliesDO.getIdCard()));
+ authHistoryRecordDO.setId(authId);
+ authHistoryRecordDO.setBrithday(DateUtils.format(IdcardUtil.getBirthDate(authElderliesDO.getIdCard()),DateUtils.yyyyMMdd_format));
authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderliesDO.getIdCard()));
}
authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
@@ -375,7 +404,7 @@
ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
if(authElderliesDO != null){
BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
- authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderliesDO.getIdCard()));
+ authHistoryRecordDO.setBrithday(DateUtils.format(IdcardUtil.getBirthDate(authElderliesDO.getIdCard()),DateUtils.yyyyMMdd_format));
authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderliesDO.getIdCard()));
}
BeanUtils.copyProperties(authRecords,authHistoryRecordDO);
@@ -401,8 +430,10 @@
//查询老人信息
ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
if(authPensionerDO != null){
+ Long authId = pensionAuthDO.getId();
BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
- pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPensionerDO.getIdCard()));
+ pensionAuthDO.setId(authId);
+ pensionAuthDO.setBrithday(DateUtils.format(IdcardUtil.getBirthDate(authPensionerDO.getIdCard()),DateUtils.yyyyMMdd_format));
pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPensionerDO.getIdCard()));
}
pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
@@ -421,7 +452,7 @@
ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
if(authPensionerDO != null){
BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
- pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPensionerDO.getIdCard()));
+ pensionAuthDO.setBrithday(DateUtils.format(IdcardUtil.getBirthDate(authPensionerDO.getIdCard()),DateUtils.yyyyMMdd_format));
pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPensionerDO.getIdCard()));
}
BeanUtils.copyProperties(authRecords,pensionAuthDO);
@@ -562,4 +593,35 @@
public R retrieveElderAuthDetail(Long identityAuthId) {
return R.ok(comElderAuthRecordsDAO.findById(identityAuthId));
}
+
+ @Override
+ public R add(ComElderAuthRecordVO comElderAuthRecordVO) {
+ if(!comElderAuthRecordVO.getIdCard().isEmpty()){
+ List<ComMngPopulationDO> comMngPopulationDOS=comMngPopulationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNoStr,comElderAuthRecordVO.getIdCard()).orderByDesc(ComMngPopulationDO::getCreateAt));
+ if(!comMngPopulationDOS.isEmpty()){
+ ComMngPopulationDO comMngPopulationDO=comMngPopulationDOS.get(0);
+ ComElderAuthElderliesDO comElderAuthElderliesDO=comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>().lambda().eq(ComElderAuthElderliesDO::getPopulationId,comMngPopulationDO.getId()));
+ if(comElderAuthElderliesDO!=null){
+ Integer count=comElderAuthRecordsDAO.selectCount(new QueryWrapper<ComElderAuthRecordsDO>().lambda().eq(ComElderAuthRecordsDO::getElderliesId,comElderAuthElderliesDO.getId()).eq(ComElderAuthRecordsDO::getAuthPeriod,comElderAuthRecordVO.getAuthPeriod()));
+ if(count==0){
+ ComElderAuthRecordsDO comElderAuthRecordsDO=new ComElderAuthRecordsDO();
+ BeanUtils.copyProperties(comElderAuthRecordVO,comElderAuthRecordsDO);
+ comElderAuthRecordsDO.setElderliesId(comElderAuthElderliesDO.getId());
+ comElderAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus());
+ comElderAuthRecordsDO.setApprovalDate(new Date());
+ comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());
+ comElderAuthRecordsDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz);
+ if (this.baseMapper.insert(comElderAuthRecordsDO) < 0) {
+ return R.fail("认证失败，请重新尝试");
+ }
+ return R.ok();
+ }
+ return R.fail("当前期数已认证，请勿重复认证");
+ }
+ return R.fail("无养老认证数据");
+ }
+ return R.fail("该身份证无实有人口信息");
+ }
+ return R.fail("身份证不能为空");
+ }
}
--
Gitblit v1.7.1