diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java index 74ab571..807c604 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java @@ -3,14 +3,10 @@ package com.elink.esua.epdc.vaccine.epidemic.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordDetailDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserDeptInfoDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserInfoDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO; +import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; +import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.*; +import com.elink.esua.epdc.vaccine.epidemic.dto.result.*; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -263,4 +259,11 @@ public interface EpidemicUserInfoDao extends BaseDao { * @date 2022/5/30 9:27 */ EpidemicUnitOwnerDTO getOwner(Map params); + + /** + * 获取成员信息 + * @param formDTO + * @return + */ + FamilyMemberInfoResultDTO getFamilyMember(GetMemberListFormDTO formDTO); } 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 dbea258..9e8ffba 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,13 +5,15 @@ 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.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.result.FamilyMemberInfoResultDTO; import com.elink.esua.epdc.vaccine.epidemic.dto.*; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.result.*; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -205,4 +207,26 @@ public interface EpidemicUserInfoService extends CrudService getOwner(Map params); + + /** + * 获取成员信息 + * @param formDTO + * @return + */ + Result getFamilyMember(GetMemberListFormDTO formDTO); + + /** + * 添加成员 + * @param formDTO + * @return + */ + Result addFamilyMember(FamilyMemberInfoFormDTO formDTO); + + /** + * 修改成员 + * @param formDTO + * @return + */ + Result updateFamilyMember(FamilyMemberInfoFormDTO formDTO); + } 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 13b6f27..702c463 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 @@ -24,21 +24,27 @@ 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; import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; +import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; +import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; +import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotBuildingResultDTO; +import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO; +import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; import com.elink.esua.epdc.vaccine.constant.ImageConstant; import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao; +import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInoutRecordDao; import com.elink.esua.epdc.vaccine.epidemic.dto.*; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.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.entity.EpidemicUserInoutRecordEntity; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicReportUserInfoService; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserErrorService; 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.EpidemicUnitOwnerDao; +import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotBuildingService; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicUnitOwnerService; @@ -100,6 +106,12 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl getWrapper(Map params) { String id = (String) params.get("id"); @@ -1612,4 +1624,46 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl().ok(baseDao.getOwner(params)); } + @Override + public Result getFamilyMember(GetMemberListFormDTO formDTO) { + + FamilyMemberInfoResultDTO dto = baseDao.getFamilyMember(formDTO); + + return new Result().ok(dto); + } + + @Override + public Result addFamilyMember(FamilyMemberInfoFormDTO formDTO) { + // 新增epidemic_user_info + EpidemicUserInfoEntity epidemicUserInfoEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInfoEntity.class); + baseDao.insert(epidemicUserInfoEntity); + + // 新增epidemic_user_inout_record + EpidemicUserInoutRecordEntity epidemicUserInoutRecordEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInoutRecordEntity.class); + epidemicUserInoutRecordDao.insert(epidemicUserInoutRecordEntity); + + // 新增人员房屋关系 + EpidemicUnitOwnerEntity epidemicUnitOwnerEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUnitOwnerEntity.class); + epidemicUnitOwnerEntity.setOwnerName(formDTO.getUserName()); + epidemicUnitOwnerEntity.setAddress(formDTO.getOutLiveAddressDetail()); + epidemicUnitOwnerDao.insert(epidemicUnitOwnerEntity); + + return new Result(); + } + + @Override + public Result updateFamilyMember(FamilyMemberInfoFormDTO formDTO) { + // 更新epidemic_user_info + EpidemicUserInfoEntity epidemicUserInfoEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInfoEntity.class); + epidemicUserInfoEntity.setId(formDTO.getUserId()); + baseDao.updateById(epidemicUserInfoEntity); + + // 更新epidemic_user_inout_record + EpidemicUserInoutRecordEntity epidemicUserInoutRecordEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInoutRecordEntity.class); + epidemicUserInoutRecordEntity.setId(formDTO.getRecordId()); + epidemicUserInoutRecordDao.updateById(epidemicUserInoutRecordEntity); + + 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 new file mode 100644 index 0000000..ec3b2df --- /dev/null +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java @@ -0,0 +1,123 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.vaccine.personroom.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +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.result.EpidemicPlotCoordinateResultDTO; +import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; +import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotCoordinateExcel; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; +import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotCoordinateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 我的家庭 + * + * @author zhangyuan qu@elink-cn.com + * @since v1.0.0 2021-07-09 + */ +@RestController +@RequestMapping("family") +public class AppFamilyController { + + @Autowired + private EpidemicUserInfoService epidemicUserInfoService; + + @Autowired + private EpidemicBuildingUnitService epidemicBuildingUnitService; + + /** + * 获取成员信息 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @GetMapping("getFamilyMember") + public Result getFamilyMember(@RequestBody GetMemberListFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return epidemicUserInfoService.getFamilyMember(formDTO); + } + + /** + * 新增成员信息 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @PostMapping("addFamilyMember") + public Result addFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return epidemicUserInfoService.addFamilyMember(formDTO); + } + + /** + * 修改成员信息 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @PostMapping("updateFamilyMember") + public Result updateFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return epidemicUserInfoService.updateFamilyMember(formDTO); + } + + /** + * 获取房屋信息 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @GetMapping("getHouseInfo") + public Result getHouseInfo(@RequestBody GetHouseInfoFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return epidemicBuildingUnitService.getHouseInfo(formDTO); + } + + + + +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java index e5c61be..2fc0396 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java @@ -29,7 +29,9 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; 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.config.QrCodeProperties; +import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; +import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; import com.elink.esua.epdc.vaccine.epidemic.utils.HouseQRcodeUtils; @@ -163,4 +165,32 @@ public class BuildingUnitController { } } + /** + * 单元下拉框 + * + * @param formDTO + * @return io.pingyin.common.utils.Result> + * @author wgf + * @date 2022/6/9 8:47 + */ + @GetMapping("getUnitOption") + public Result> getUnitOption(@RequestBody EpidemicBuildingUnitDTO formDTO) { + List list = epidemicBuildingUnitService.getUnitOption(formDTO); + return new Result>().ok(list); + } + + /** + * 房间号下拉框 + * + * @param formDTO + * @return io.pingyin.common.utils.Result> + * @author wgf + * @date 2022/6/9 8:47 + */ + @GetMapping("getHouseOption") + public Result> getHouseOption(@RequestBody EpidemicBuildingUnitDTO formDTO) { + List list = epidemicBuildingUnitService.getHouseOption(formDTO); + return new Result>().ok(list); + } + } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java index e94d281..e1ff45d 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java @@ -104,7 +104,7 @@ public class PlotBuildingController { * @date 2022/4/2 14:47 */ @GetMapping("getBuildingOption") - public Result> getBuildingOption(EpidemicPlotBuildingDTO formDTO) { + public Result> getBuildingOption(@RequestBody EpidemicPlotBuildingDTO formDTO) { List list = epidemicPlotBuildingService.getBuildingOption(formDTO); return new Result>().ok(list); } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java index d9b419c..f8464b9 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java @@ -123,7 +123,7 @@ public class PlotCoordinateController { * @date 2022/4/2 14:47 */ @GetMapping("getPlotOption") - public Result> getPlotOption(EpidemicPlotCoordinateDTO formDTO) { + public Result> getPlotOption(@RequestBody EpidemicPlotCoordinateDTO formDTO) { List list = epidemicPlotCoordinateService.getPlotOption(formDTO); return new Result>().ok(list); } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java index 343cd2a..d3f0314 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java @@ -18,9 +18,13 @@ package com.elink.esua.epdc.vaccine.personroom.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; +import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; +import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO; +import com.elink.esua.epdc.dto.personroom.result.HouseInfoResultDTO; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -89,4 +93,32 @@ public interface EpidemicBuildingUnitDao extends BaseDao + * @author wgf + * @date 2022/2/15 13:38 + */ + List getUnitOption(EpidemicBuildingUnitDTO formDTO); + + /** + * 房屋列表下拉框 + * + * @param formDTO + * @return java.util.List + * @author wgf + * @date 2022/2/15 13:38 + */ + List getHouseOption(EpidemicBuildingUnitDTO formDTO); + + + /** + * 获取房屋信息 + * @param formDTO + * @return + */ + HouseInfoResultDTO getHouseInfo(GetHouseInfoFormDTO formDTO); + } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java index 4ed9b8b..ebd0f34 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java @@ -18,10 +18,13 @@ package com.elink.esua.epdc.vaccine.personroom.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 房屋-房主信息 * @@ -61,4 +64,11 @@ public interface EpidemicUnitOwnerDao extends BaseDao { */ int deleteByIdCard(@Param("idCard") String idCard); + /** + * 获取成员列表根据房屋ID + * @param unitId + * @return + */ + List getFamilyMemberInfoByUnitId(@Param("unitId") Long unitId); + } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java index 82c6df9..2f53b16 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java @@ -20,7 +20,10 @@ package com.elink.esua.epdc.vaccine.personroom.service; import com.elink.esua.epdc.commons.mybatis.service.CrudService; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; +import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; +import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; @@ -109,4 +112,31 @@ public interface EpidemicBuildingUnitService extends CrudService + * @author wgf + * @date 2022/2/15 13:38 + */ + List getUnitOption(EpidemicBuildingUnitDTO formDTO); + + /** + * 房屋列表下拉框 + * + * @param formDTO + * @return java.util.List + * @author wgf + * @date 2022/2/15 13:38 + */ + List getHouseOption(EpidemicBuildingUnitDTO formDTO); + + /** + * 获取房屋信息 + * @param formDTO + * @return + */ + Result getHouseInfo(GetHouseInfoFormDTO formDTO); + } 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 a385403..458fb34 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 @@ -31,12 +31,12 @@ import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.StreamUtils; import com.elink.esua.epdc.dto.CompleteDeptDTO; +import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.house.result.EpdcPopulationErrorResultDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; -import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; -import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotBuildingResultDTO; -import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO; +import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; +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; @@ -44,6 +44,7 @@ import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; 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.EpidemicBuildingUnitEntity; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicBuildingUnitRedis; @@ -87,6 +88,9 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl page(Map params) { IPage page = getPage(params); @@ -516,4 +520,24 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl getUnitOption(EpidemicBuildingUnitDTO formDTO) { + return baseDao.getUnitOption(formDTO); + } + + @Override + public List getHouseOption(EpidemicBuildingUnitDTO formDTO) { + return baseDao.getHouseOption(formDTO); + } + + @Override + public Result getHouseInfo(GetHouseInfoFormDTO formDTO) { + HouseInfoResultDTO houseInfoResultDTO = baseDao.getHouseInfo(formDTO); + + List members = epidemicUnitOwnerDao.getFamilyMemberInfoByUnitId(houseInfoResultDTO.getId()); + houseInfoResultDTO.setMembers(members); + + return new Result().ok(houseInfoResultDTO); + } + } diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml index fb58f0a..2d5e489 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml @@ -660,4 +660,41 @@ AND i.ID_CARD = #{idCard} LIMIT 1 + + diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml index 55968d2..0a66ef8 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml @@ -152,4 +152,44 @@ epidemic_building_unit + + + + + diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml index 9b6b3be..4931de6 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml @@ -42,4 +42,38 @@ UNIT_ID = #{unitId} AND ID_CARD = #{idCard} + +