From 84fae9aed66f2841b58b2ef66ff7c11cd0dbaacd Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 08 十月 2021 17:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 919fa11..ca60b06 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
@@ -38,7 +38,6 @@
import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
@@ -100,6 +99,15 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
+
+ try {
+ //关键词为空时需要进行加密，通过加密去检索身份证号筛选高龄认证记录
+ String idCard = AESUtil.encrypt128(pageElderAuthRecordsDTO.getSearchKey(), aesKey);
+ pageElderAuthRecordsDTO.setIdCard(idCard);
+ }catch (Exception e){
+ log.error("查询高龄认证记录转换身份证号失败");
+ }
+
IPage<ComElderAuthRecordVO> iPage = comElderAuthRecordsDAO.pageElderAuthRecords(page, pageElderAuthRecordsDTO);
if (!iPage.getRecords().isEmpty()) {
iPage.getRecords().forEach(comElderAuthRecordVO -> {
@@ -146,7 +154,7 @@
} else {
sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason());
}
- comElderAuthRecordsDO.setApprovalDate(new Date());
+// comElderAuthRecordsDO.setApprovalDate(new Date());
int nub = comElderAuthRecordsDAO.updateById(comElderAuthRecordsDO);
if (nub < 1) {
return R.fail("审核失败");
@@ -384,7 +392,6 @@
, ComElderAuthElderliesDO comElderAuthElderliesDO, String authPeriod, Long userId, Long communityId,Date date) {
ComElderAuthRecordsDO comElderAuthRecordsDO = new ComElderAuthRecordsDO();
BeanUtils.copyProperties(vo, comElderAuthRecordsDO);
- comElderAuthRecordsDO.setId(Snowflake.getId());
comElderAuthRecordsDO.setElderliesId(comElderAuthElderliesDO.getId());
comElderAuthRecordsDO.setAuthPeriod(authPeriod);
comElderAuthRecordsDO.setSubmitUserId(userId);
--
Gitblit v1.7.1