diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java index 9e8ffba..6de01a2 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java @@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.mybatis.service.CrudService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; +import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO; import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; @@ -229,4 +230,11 @@ public interface EpidemicUserInfoService extends CrudService result = adminVimFeignClient.getParentAndAllDept(formDTO.getDeptId()); + ParentAndAllDeptDTO parentAndAllDeptDTO = result.getData(); + formDTO.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds()); + formDTO.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames()); + formDTO.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); + formDTO.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames()); + formDTO.setGridName(parentAndAllDeptDTO.getGrid()); + // 新增epidemic_user_info + EpidemicUserInfoEntity epidemicUserInfoEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInfoEntity.class); + baseDao.insert(epidemicUserInfoEntity); + } + + // 绑定房屋 + EpidemicUnitOwnerEntity epidemicUnitOwnerEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUnitOwnerEntity.class); + epidemicUnitOwnerEntity.setOwnerName(formDTO.getUserName()); + epidemicUnitOwnerEntity.setAddress(formDTO.getHouseAddress()); + epidemicUnitOwnerService.insert(epidemicUnitOwnerEntity); + + return new Result(); + } + } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java index ec3b2df..cf4840a 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java @@ -27,10 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; -import com.elink.esua.epdc.dto.personroom.form.EpidemicPlotCoordinateFormDTO; -import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; -import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; -import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; +import com.elink.esua.epdc.dto.personroom.form.*; import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotCoordinateResultDTO; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotCoordinateExcel; @@ -117,6 +114,20 @@ public class AppFamilyController { return epidemicBuildingUnitService.getHouseInfo(formDTO); } + /** + * 绑定我的家庭房屋 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @PostMapping("bindingFamily") + public Result bindingFamily(@RequestBody BindingFamilyFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return epidemicUserInfoService.bindingFamily(formDTO); + } +