From 03bcd057d716f73cdd70589634e326e7c40e5e60 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 08 十一月 2021 18:19:24 +0800
Subject: [PATCH] Merge branch 'zhaozhengjie1104'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java | 10 ++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml | 2 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java | 9 ++++-----
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 2 +-
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java
index 23ea7d9..4081632 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java
@@ -4,6 +4,7 @@
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
@@ -12,6 +13,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
/**
* @title: AddIdentityAuthDTO
@@ -62,4 +65,11 @@
@ApiModelProperty(value = "社区id", hidden = true)
private Long communityId;
+
+ @ApiModelProperty("认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date authTime;
+
+ @ApiModelProperty("认证期数")
+ private String authPeriod;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
index 16f39be..4632ca0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -91,6 +91,6 @@
"HAVING distance >= 0 and distance <= #{communityDTO.distance} ORDER BY distance ASC")
List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);
- @Select("select t.community_id,t.`name` from com_act t left join com_street t1 on t.street_id = t1.street_id where t.state = 0 and t1.street_id in (12,14,15,16,17,18)")
+ @Select("select t.community_id,t.`name` from com_act t left join com_street t1 on t.street_id = t1.street_id where t.state = 0 and t1.street_id in (12,14,15,16,17,19)")
List<EventGridCommunityAdminVO> getWestCommunityLists();
}
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 ac5da9f..f7ffd19 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
@@ -485,16 +485,15 @@
return R.fail("信息有误,请检查!");
}
Date dateNow = new Date();
- String currentAuthPeriod = new SimpleDateFormat("yyyy").format(dateNow);
List<ComPensionAuthRecordDO> currentAuthPeriodRecords = comPensionAuthRecordDAO
.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda()
- .eq(ComPensionAuthRecordDO::getAuthPeriod, currentAuthPeriod)
+ .eq(ComPensionAuthRecordDO::getAuthPeriod, comPensionAuthPensionerDO)
.eq(ComPensionAuthRecordDO::getPensionerId, comPensionAuthPensionerDO.getId()));
if (!currentAuthPeriodRecords.isEmpty()) {
boolean alreadyAuth = currentAuthPeriodRecords.stream()
.filter(record -> record.getAuthStatus().equals(CERTIFIED.getStatus())).findFirst().isPresent();
if (alreadyAuth) {
- return R.fail(String.format("该人员%s期已认证无需重复认证", currentAuthPeriod));
+ return R.fail(String.format("该人员%s期已认证无需重复认证", addIdentityAuthDTO.getAuthPeriod()));
}
boolean isPendingReview = currentAuthPeriodRecords.stream()
.filter(record -> record.getApprovalStatus().intValue() == PENDING_REVIEW.getStatus()).findFirst().isPresent();
@@ -505,8 +504,8 @@
ComPensionAuthRecordDO comPensionAuthRecordDO = new ComPensionAuthRecordDO();
BeanUtils.copyProperties(addIdentityAuthDTO, comPensionAuthRecordDO);
comPensionAuthRecordDO.setPensionerId(comPensionAuthPensionerDO.getId());
- comPensionAuthRecordDO.setAuthDate(dateNow);
- comPensionAuthRecordDO.setAuthPeriod(currentAuthPeriod);
+ comPensionAuthRecordDO.setAuthDate(addIdentityAuthDTO.getAuthTime());
+ comPensionAuthRecordDO.setAuthPeriod(addIdentityAuthDTO.getAuthPeriod());
if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) {
comPensionAuthRecordDO.setApprovalStatus(PASS_THROUGH.getStatus());
comPensionAuthRecordDO.setApprovalDate(dateNow);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
index 56af6cd..bcf9ddb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
@@ -308,6 +308,8 @@
AND cmp.door_no = #{comMngPopulationVO.doorNo} </if>
<if test='comMngPopulationVO.floor != null and comMngPopulationVO.floor != ""'>
AND cmp.floor = #{comMngPopulationVO.floor} </if>
+ <if test='comMngPopulationVO.isDeath != null'>
+ AND cmp.death = #{comMngPopulationVO.isDeath} </if>
<if test='comMngPopulationVO.unitNo != null and comMngPopulationVO.unitNo != ""'>
AND cmp.unit_no = #{comMngPopulationVO.unitNo} </if>
<if test='comMngPopulationVO.houseNo != null and comMngPopulationVO.houseNo != ""'>
--
Gitblit v1.7.1