diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java index 61d9802..2e54303 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java @@ -19,8 +19,12 @@ package com.elink.esua.epdc.vaccine.epidemic.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO; +import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoAuditEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 疫情防控信息表 @@ -39,5 +43,16 @@ public interface EpidemicUserInfoAuditDao extends BaseDao listByUnitId(@Param("unitId") Long unitId, @Param("existIdCard") List existIdCard); } \ No newline at end of file diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java index ac6730f..57e4767 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO; import com.elink.esua.epdc.dto.epidemic.result.EpidemicUserInfoAuditResultDTO; +import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoAuditEntity; import java.util.List; @@ -75,6 +76,17 @@ public interface EpidemicUserInfoAuditService extends BaseService listByUnitId(Long unitId, List existIdCard); + /** * 默认保存 * diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java index c2ac91e..d1d5e9d 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO; import com.elink.esua.epdc.dto.epidemic.result.EpidemicUserInfoAuditResultDTO; import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; +import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoAuditDao; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoAuditEntity; import com.elink.esua.epdc.vaccine.epidemic.redis.EpidemicUserInfoAuditRedis; @@ -112,6 +113,11 @@ public class EpidemicUserInfoAuditServiceImpl extends BaseServiceImpl listByUnitId(Long unitId, List existIdCard) { + return baseDao.listByUnitId(unitId, existIdCard); + } + @Override @Transactional(rollbackFor = Exception.class) public void save(EpidemicUserInfoAuditDTO dto) { diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java index b5913db..f29e929 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java @@ -45,6 +45,7 @@ import com.elink.esua.epdc.dto.personroom.result.*; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserErrorEntity; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserErrorService; +import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoAuditService; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; import com.elink.esua.epdc.vaccine.epidemic.utils.HouseQRcodeUtils; import com.elink.esua.epdc.vaccine.epidemic.utils.StreamUtils; @@ -104,6 +105,9 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl members = epidemicUnitOwnerDao.getFamilyMemberInfoByUnitId(houseInfoResultDTO.getId()); + + // 找出待审核的数据 + List existIdCard = members.stream().map(FamilyMemberInfoResultDTO::getIdCard).collect(Collectors.toList()); + List auditMembers = epidemicUserInfoAuditService.listByUnitId(houseInfoResultDTO.getId(), existIdCard); + members.addAll(auditMembers); + houseInfoResultDTO.setMembers(members); } diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml index fe53def..1b6427e 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml @@ -58,4 +58,19 @@ UPDATED_TIME DESC LIMIT 1 + \ No newline at end of file