From d1992befcf7c1c850af0e7174200617aa197476d Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 13 十月 2021 11:23:59 +0800
Subject: [PATCH] [修改]将com_act_questnaire_sub 表的大写字母全部改为小写字母
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
index 23df4fa..e0f577c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
@@ -15,6 +15,8 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.service_community.service.ComPensionAuthPensionerService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -33,12 +35,6 @@
import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordExcleVO;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportMistakeExcelVO;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordStatisticExcleVO;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO;
-import com.panzhihua.common.model.vos.community.SysConfVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
@@ -90,6 +86,8 @@
private ComActActSignDAO comActActSignDAO;
@Value("${domain.aesKey:}")
private String aesKey;
+ @Resource
+ private ComPensionAuthPensionerService comPensionAuthPensionerService;
@Override
public R pagePensionAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -140,10 +138,19 @@
if (comPensionAuthRecordDO == null) {
return R.fail("未查询到养老认证记录");
}
+
+ ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(comPensionAuthRecordDO.getPensionerId());
+ if(authPensionerDO == null){
+ return R.fail("未查询到老人信息");
+ }
+
BeanUtils.copyProperties(comPensionAuthRecordVO, comPensionAuthRecordDO);
if (comPensionAuthRecordVO.getApprovalStatus().equals(PASS_THROUGH.getStatus())) {
comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus());
sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", "认证成功！");
+
+ authPensionerDO.setAddress(comPensionAuthRecordVO.getAddress());
+ comPensionAuthPensionerDAO.updateById(authPensionerDO);
} else {
sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", comPensionAuthRecordVO.getRejectReason());
}
@@ -199,6 +206,8 @@
List<ComPensionAuthRecordDO> saveList = new ArrayList<>();
// 需要修改的认证记录集合
List<ComPensionAuthRecordDO> updateList = new ArrayList<>();
+ // 需要更新的老人信息
+ List<ComPensionAuthPensionerDO> updatePensionerList = new ArrayList<>();
log.info("开始处理导入数据");
Date nowDate = new Date();
List<ComPensionAuthRecordImportMistakeExcelVO> mistakes = new ArrayList<>();
@@ -258,15 +267,30 @@
//存在待审核记录，进行更新认证信息
comPensionAuthRecordDO = updatePensionAuthRecordsDO(vo, comPensionAuthRecordDO, userId,communityId,nowDate);
updateList.add(comPensionAuthRecordDO);
+
+ if(StringUtils.isNotEmpty(vo.getAddress())){
+ comPensionAuthPensionerDO.setAddress(vo.getAddress());
+ updatePensionerList.add(comPensionAuthPensionerDO);
+ }
}else {
// 不存在记录,则新增
comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId,nowDate);
saveList.add(comPensionAuthRecordDO);
+
+ if(StringUtils.isNotEmpty(vo.getAddress())){
+ comPensionAuthPensionerDO.setAddress(vo.getAddress());
+ updatePensionerList.add(comPensionAuthPensionerDO);
+ }
}
}else {
// 不存在记录,则新增
comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId,nowDate);
saveList.add(comPensionAuthRecordDO);
+
+ if(StringUtils.isNotEmpty(vo.getAddress())){
+ comPensionAuthPensionerDO.setAddress(vo.getAddress());
+ updatePensionerList.add(comPensionAuthPensionerDO);
+ }
}
}
}
@@ -296,6 +320,9 @@
comPensionAuthRecordDAO.updateAll(updateList);
log.info("数据库更新线下认证记录完成");
}
+ if(!updatePensionerList.isEmpty()){
+ comPensionAuthPensionerService.updateBatchById(updatePensionerList);
+ }
log.info("执行数据库导入完成");
if (!mistakes.isEmpty()) {
--
Gitblit v1.7.1