Merge remote-tracking branch 'origin/dev'

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java

@@ -162,4 +162,12 @@ public interface PartymemberInfoService extends BaseService<PartymemberInfoEntit
      * @Date 2020/7/22 12:14
      **/
     List<PartymemberInfoDTO> listPartymemberInfoByGridId(List<String> gridIdList);
+
+    /**
+     * 获取党员信息
+     * @param customerId
+     * @param userId
+     * @return
+     */
+    PartymemberInfoDTO getPartyMemberInfoByUser(String customerId, String userId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -191,7 +191,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		//党员信息存入党员认证信息表
 		PartymemberInfoEntity partyMemberInfoEntity = ConvertUtils.sourceToTarget(partyMemberInfoDTO,
 				PartymemberInfoEntity.class);
-
+		PartymemberInfoDTO info = partymemberInfoService.getPartyMemberInfoByUser(partyMemberInfoDTO.getCustomerId(), partyMemberInfoDTO.getUserId());
+		if (null != info) {
+			partyMemberInfoDTO.setId(info.getId());
+		}
 		if (confirmAutoDTO == null || !confirmAutoDTO.getComparisonResults()) {
 			log.info("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO));
 			//将访问记录更新到热心居民申请行为记录表

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.epmet.modules.partymember.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -25,6 +26,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.PartyMemberConstant;
 import com.epmet.dto.form.CreatedTimeByUserIdFormDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
@@ -41,6 +43,7 @@ import com.epmet.resi.partymember.dto.partymember.form.CertifiedDetailFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.CertifiedDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyAuthProcessingCountResultDTO;
+import kotlin.jvm.internal.Lambda;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -235,4 +238,14 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		List<PartymemberInfoDTO> list = baseDao.selectListPartymemberInfoByGridId(gridIdList);
 		return list;
 	}
+
+	@Override
+	public PartymemberInfoDTO getPartyMemberInfoByUser(String customerId, String userId) {
+		LambdaQueryWrapper<PartymemberInfoEntity> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PartymemberInfoEntity :: getCustomerId, customerId);
+		wrapper.eq(PartymemberInfoEntity :: getUserId, userId);
+		wrapper.ne(PartymemberInfoEntity :: getConfirmResult, PartyMemberConstant.REJECTED);
+		PartymemberInfoEntity entity = baseDao.selectOne(wrapper);
+		return ConvertUtils.sourceToTarget(entity, PartymemberInfoDTO.class);
+	}
 }