待审核数据追加

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<EpidemicUserInfoAuditE
      * @author generator
      * @date 2022-06-29
      */
-    EpidemicUserInfoAuditDTO getByIdCard(String idCard);
+    EpidemicUserInfoAuditDTO getByIdCard(@Param("idCard") String idCard);
+
+    /**
+     * 根据房屋ID查询
+     *
+     * @param unitId
+     * @param existIdCard
+     * @return com.elink.esua.epdc.dto.FamilyMemberInfoResultDTO
+     * @author zhy
+     * @date 2022/6/30 14:12
+     */
+    List<FamilyMemberInfoResultDTO> listByUnitId(@Param("unitId") Long unitId, @Param("existIdCard") List<String> existIdCard);
 }

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<EpidemicUserIn
      */
     EpidemicUserInfoAuditDTO getByIdCard(String idCard);
 
+    /**
+     * 根据房屋ID查询
+     *
+     * @param unitId
+     * @param existIdCard
+     * @return com.elink.esua.epdc.dto.FamilyMemberInfoResultDTO
+     * @author zhy
+     * @date 2022/6/30 14:12
+     */
+    List<FamilyMemberInfoResultDTO> listByUnitId(Long unitId, List<String> existIdCard);
+
     /**
      * 默认保存
      *

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<EpidemicUs
         return baseDao.getByIdCard(idCard);
     }
 
+    @Override
+    public List<FamilyMemberInfoResultDTO> listByUnitId(Long unitId, List<String> existIdCard) {
+        return baseDao.listByUnitId(unitId, existIdCard);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(EpidemicUserInfoAuditDTO dto) {

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<EpidemicBui
     @Autowired
     private EpidemicPlotBuildingService epidemicPlotBuildingService;
 
+    @Autowired
+    private EpidemicUserInfoAuditService epidemicUserInfoAuditService;
+
     @Autowired
     private VimAdminFeignClient adminVimFeignClient;
 
@@ -914,6 +918,12 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
 
         if (houseInfoResultDTO != null) {
             List<FamilyMemberInfoResultDTO> members = epidemicUnitOwnerDao.getFamilyMemberInfoByUnitId(houseInfoResultDTO.getId());
+
+            // 找出待审核的数据
+            List<String> existIdCard = members.stream().map(FamilyMemberInfoResultDTO::getIdCard).collect(Collectors.toList());
+            List<FamilyMemberInfoResultDTO> auditMembers = epidemicUserInfoAuditService.listByUnitId(houseInfoResultDTO.getId(), existIdCard);
+            members.addAll(auditMembers);
+
             houseInfoResultDTO.setMembers(members);
         }
 

epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml

@@ -58,4 +58,19 @@
             UPDATED_TIME DESC
             LIMIT 1
     </select>
+    <select id="listByUnitId" resultType="com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO">
+        SELECT
+            *
+        FROM
+            epidemic_user_info_audit
+        WHERE
+            DEL_FLAG = '0'
+        <if test="existIdCard != null and  existIdCard.size() > 0">
+            AND ID_CARD NOT IN
+            <foreach collection="existIdCard" open="(" close=")" separator=","  item="idCard">
+                #{idCard}
+            </foreach>
+        </if>
+            AND UNIT_ID = #{unitId}
+    </select>
 </mapper>