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/ComPensionAuthRecordServiceImpl.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 2514852..a6e9593 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
@@ -9,6 +9,12 @@
import javax.annotation.Resource;
+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.service_community.dao.ComPensionAuthStatisticsDAO;
+import com.panzhihua.service_community.model.dos.ComPensionAuthStatisticsDO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -337,14 +343,6 @@
return ObjectUtils.isEmpty(hashMap.get(key));
}
- @Resource
- private ComPensionAuthRecordDAO comPensionAuthRecordDAO;
- @Resource
- private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;
-
- @Value("${domain.aesKey:}")
- private String aesKey;
-
/**
* 新增养老认证
* @param addIdentityAuthDTO 请求参数
@@ -377,7 +375,7 @@
.eq(ComPensionAuthRecordDO::getAuthPeriod, currentAuthPeriod)
.eq(ComPensionAuthRecordDO::getPensionerId, comPensionAuthPensionerDO.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()) {
@@ -392,7 +390,7 @@
if (addIdentityAuthDTO.getType().intValue() == 2) {
comPensionAuthRecordDO.setApprovalStatus(3);
comPensionAuthRecordDO.setApprovalDate(dateNow);
- comPensionAuthRecordDO.setAuthStatus(true);
+ comPensionAuthRecordDO.setAuthStatus(1);
}
if (this.baseMapper.insert(comPensionAuthRecordDO) < 0) {
return R.fail("认证失败，请重新尝试");
--
Gitblit v1.7.1