榆山-居民部门显示不正确

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java

@@ -3,6 +3,7 @@ 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.enterprise.result.EnterpriseDeptNameResultDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO;
@@ -278,4 +279,6 @@ public interface EpidemicUserInfoDao extends BaseDao<EpidemicUserInfoEntity> {
      * @return
      */
     FamilyMemberInfoResultDTO getFamilyMember(GetMemberListFormDTO formDTO);
+
+    List<EnterpriseDeptNameResultDTO> getDeptName(@Param("idCard") String idCard);
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.constant.PopulationDictConstant;
 import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+import com.elink.esua.epdc.dto.enterprise.result.EnterpriseDeptNameResultDTO;
 import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO;
 import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO;
 import com.elink.esua.epdc.dto.house.result.EpdcPopulationErrorResultDTO;
@@ -164,6 +165,21 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             params.put("deptIdList", user.getDeptIdList());
         }
         List<EpidemicRecordListDTO> list = baseDao.getEpidemicUserRecordList(params);
+
+
+        //
+        list.forEach(
+                epidemicRecord->{
+                    List<EnterpriseDeptNameResultDTO> deptList = baseDao.getDeptName(epidemicRecord.getIdCard());
+                    for (EnterpriseDeptNameResultDTO enterpriseDeptNameResultDTO : deptList) {
+                        if (enterpriseDeptNameResultDTO!=null){
+                            if (enterpriseDeptNameResultDTO.getGridName()!=null && enterpriseDeptNameResultDTO.getStreetName()!=null && enterpriseDeptNameResultDTO.getCommunityName()!=null){
+                                epidemicRecord.setAllDeptNames("平阴县-"+enterpriseDeptNameResultDTO.getStreetName()+"-"+enterpriseDeptNameResultDTO.getCommunityName()+"-"+enterpriseDeptNameResultDTO.getGridName());
+                                break;
+                            }
+                        }
+                    }
+                });
 //        for (EpidemicRecordListDTO eru : list) {
 //            eru.setUserName(nameDesensitization(eru.getUserName()));
 //        }

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

@@ -746,5 +746,22 @@
         and ui.ID_CARD = #{idCard}
         limit 1
 
+    </select>
+    <select id="getDeptName"
+            resultType="com.elink.esua.epdc.dto.enterprise.result.EnterpriseDeptNameResultDTO">
+
+        select
+            d.name as gridName,pc.STREET_NAME as streetName,pc.COMMUNITY_NAME as communityName
+        from epidemic_user_info ui
+                 left join epidemic_unit_owner owner on owner.ID_CARD = ui.ID_CARD
+                 left join epidemic_building_unit unit on unit.Id = owner.UNIT_ID
+                 left join epidemic_plot_building build on build.ID = unit.BUILDING_ID
+                 left join epidemic_plot_coordinate pc on pc.ID = build.PLOT_ID
+                 LEFT JOIN epidemic_plot_grid g ON pc.ID = g.PLOT_ID
+                 LEFT JOIN esua_epdc_admin.sys_dept d ON d.id = g.GRID_ID
+        where ui.DEL_FLAG='0'
+          AND ui.ID_CARD = #{idCard}
+
+
     </select>
 </mapper>