From 46da6fb73dfd33f39edf8f897212aa3a4f3d9703 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 13 九月 2021 16:26:29 +0800
Subject: [PATCH] 添加merger缺少代码
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 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 5600d8f..2567aff 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
@@ -9,6 +9,10 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.ComElderAuthRecordExcleVO;
+import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
+import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportMistakeExcelVO;
+import com.panzhihua.common.model.vos.community.ComElderAuthRecordStatisticExcleVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -366,14 +370,6 @@
return ObjectUtils.isEmpty(hashMap.get(key));
}
- @Resource
- private ComElderAuthRecordsDAO comElderAuthRecordsDAO;
- @Resource
- private ComElderAuthElderliesDAO comElderAuthElderliesDAO;
-
- @Value("${domain.aesKey:}")
- private String aesKey;
-
/**
* 新增高龄认证
* @param addIdentityAuthDTO 请求参数
@@ -406,7 +402,7 @@
.eq(ComElderAuthRecordsDO::getAuthPeriod, currentAuthPeriod)
.eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId()));
if (!currentAuthPeriodRecords.isEmpty()) {
- if (currentAuthPeriodRecords.stream().filter(record -> record.getAuthStatus()).findFirst().isPresent()) {
+ if (currentAuthPeriodRecords.stream().filter(record -> record.getAuthStatus().equals(1)).findFirst().isPresent()) {
return R.fail(String.format("该人员%s期已认证无需重复认证", currentAuthPeriod));
}
if (currentAuthPeriodRecords.stream().filter(record -> record.getApprovalStatus().intValue() == 1).findFirst().isPresent()) {
@@ -421,16 +417,12 @@
if (addIdentityAuthDTO.getType().intValue() == 2) {
comElderAuthRecordsDO.setApprovalStatus(3);
comElderAuthRecordsDO.setApprovalDate(dateNow);
- comElderAuthRecordsDO.setAuthStatus(true);
+ comElderAuthRecordsDO.setAuthStatus(1);
}
if (this.baseMapper.insert(comElderAuthRecordsDO) < 0) {
return R.fail("认证失败，请重新尝试");
}
return R.ok();
- }
-
- public static void main(String[] args) throws Exception {
- System.out.println(AESUtil.encrypt128("500381199804034737", "Ryo7M3n8loC5"));
}
/**
--
Gitblit v1.7.1