Merge branch 'feature/user_house_import'

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

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java

@@ -297,7 +297,7 @@ public class EpidemicReportUserInfoDTO implements Serializable {
 //    @Excel(name = "房屋地址")
     private String houseAddress;
 
-
+    private String unitId;
 
 
 }

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

@@ -27,14 +27,15 @@ 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.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.*;
+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.entity.EpidemicUserErrorEntity;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInoutRecordEntity;
@@ -46,8 +47,6 @@ 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;
 import com.elink.esua.epdc.vaccine.vim.dao.VaccinationInfoDao;
 import com.elink.esua.epdc.vaccine.vim.dao.VimImgDao;
@@ -100,10 +99,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     private VimImgDao vimImgDao;
     @Autowired
     private EpidemicUserErrorService epidemicUserErrorService;
-    @Autowired
+
-    private EpidemicPlotBuildingService epidemicPlotBuildingService;
-    @Autowired
-    private EpidemicBuildingUnitService epidemicBuildingUnitService;
     @Autowired
     private EpidemicUnitOwnerService epidemicUnitOwnerService;
 
@@ -126,6 +122,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Override
     public PageData<EpidemicRecordListDTO> getPageList(Map<String, Object> params) {
         IPage<EpidemicRecordListDTO> page = getPage(params);
+
         String grids = (String) params.get("deptIdList");
         String agencyList = (String) params.get("agencyList");
         params.put("deptIdList", null);
@@ -227,6 +224,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result updateNew(EpidemicReportUserInfoDTO dto) {
+        if (StringUtils.isNotBlank(dto.getUnitId())) {
+            saveHouseRelation(dto);
+        }
         //基础信息dto
         EpidemicUserInfoEntity userInfoDTO = new EpidemicUserInfoEntity();
         //录入信息dto
@@ -334,6 +334,10 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result saveNew(EpidemicReportUserInfoDTO dto) {
+        if (StringUtils.isNotBlank(dto.getUnitId())) {
+            saveHouseRelation(dto);
+        }
+
         //基础信息dto
         EpidemicUserInfoEntity userInfoDTO = new EpidemicUserInfoEntity();
         //录入信息dto
@@ -1719,4 +1723,12 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         return new Result();
     }
 
+    private void saveHouseRelation(EpidemicReportUserInfoDTO dto) {
+        // 绑定房屋
+        EpidemicUnitOwnerEntity epidemicUnitOwnerEntity = ConvertUtils.sourceToTarget(dto, EpidemicUnitOwnerEntity.class);
+        epidemicUnitOwnerEntity.setOwnerName(dto.getUserName());
+        epidemicUnitOwnerEntity.setAddress(dto.getHouseAddress());
+        epidemicUnitOwnerService.insert(epidemicUnitOwnerEntity);
+    }
+
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java

@@ -137,6 +137,12 @@ public class BuildingUnitController {
         return new Result<List<DictOptionDTO>>().ok(list);
     }
 
+    @GetMapping("getUnitOptions")
+    public Result<List<DictOptionDTO>> getUnitOptions(EpidemicBuildingUnitDTO formDTO) {
+        List<DictOptionDTO> list = epidemicBuildingUnitService.getUnitOption(formDTO);
+        return new Result<List<DictOptionDTO>>().ok(list);
+    }
+
     /**
      * 房间号下拉框
      *
@@ -151,6 +157,12 @@ public class BuildingUnitController {
         return new Result<List<DictOptionDTO>>().ok(list);
     }
 
+    @GetMapping("getHouseOptions")
+    public Result<List<DictOptionDTO>> getHouseOptions(EpidemicBuildingUnitDTO formDTO) {
+        List<DictOptionDTO> list = epidemicBuildingUnitService.getHouseOption(formDTO);
+        return new Result<List<DictOptionDTO>>().ok(list);
+    }
+
     /**
      * @return void
      * @describe: 下载房屋编码