Merge branch 'feature/user_house_import'

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;
+    private Long unitId;
 
 
 }

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

@@ -224,7 +224,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result updateNew(EpidemicReportUserInfoDTO dto) {
-        if (StringUtils.isNotBlank(dto.getUnitId())) {
+        if (dto.getUnitId() != null && dto.getUnitId() != NumConstant.ZERO) {
             saveHouseRelation(dto);
         }
         //基础信息dto
@@ -334,7 +334,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result saveNew(EpidemicReportUserInfoDTO dto) {
-        if (StringUtils.isNotBlank(dto.getUnitId())) {
+        if (dto.getUnitId() != null && dto.getUnitId() != NumConstant.ZERO) {
             saveHouseRelation(dto);
         }
 
@@ -1718,6 +1718,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         EpidemicUnitOwnerEntity epidemicUnitOwnerEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUnitOwnerEntity.class);
         epidemicUnitOwnerEntity.setOwnerName(formDTO.getUserName());
         epidemicUnitOwnerEntity.setAddress(formDTO.getHouseAddress());
+        epidemicUnitOwnerService.deletePhysicalByIdCardAndUnitId(formDTO.getIdCard(), formDTO.getUnitId());
         epidemicUnitOwnerService.insert(epidemicUnitOwnerEntity);
 
         return new Result();
@@ -1728,6 +1729,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         EpidemicUnitOwnerEntity epidemicUnitOwnerEntity = ConvertUtils.sourceToTarget(dto, EpidemicUnitOwnerEntity.class);
         epidemicUnitOwnerEntity.setOwnerName(dto.getUserName());
         epidemicUnitOwnerEntity.setAddress(dto.getHouseAddress());
+        epidemicUnitOwnerService.deletePhysicalByIdCardAndUnitId(dto.getIdCard(), dto.getUnitId());
         epidemicUnitOwnerService.insert(epidemicUnitOwnerEntity);
     }