diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index cd940d0..57bb5ee 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -47,6 +47,7 @@ import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInoutRecordService; import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient; import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExcel; +import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicBuildingUnitDao; import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; @@ -115,6 +116,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl getWrapper(Map params) { String id = (String) params.get("id"); @@ -1639,8 +1643,29 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl parentAndAllDept = adminVimFeignClient.getParentAndAllDept(gridId); + if (!parentAndAllDept.success() || parentAndAllDept.getData() == null) { + return new Result().error("获取归属部门信息失败"); + } + parentAndAllDeptDTO = parentAndAllDept.getData(); + } + // 新增epidemic_user_info EpidemicUserInfoEntity epidemicUserInfoEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInfoEntity.class); + if(parentAndAllDeptDTO != null){ + epidemicUserInfoEntity.setDeptId(parentAndAllDeptDTO.getGridId()); + epidemicUserInfoEntity.setDeptName(parentAndAllDeptDTO.getGrid()); + epidemicUserInfoEntity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames()); + epidemicUserInfoEntity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds()); + epidemicUserInfoEntity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames()); + epidemicUserInfoEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); + } baseDao.insert(epidemicUserInfoEntity); // 新增epidemic_user_inout_record