Merge branch 'feature/user_house_import'

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

@@ -73,7 +73,6 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl<EpidemicR
 
     @Override
     public PageData<EpidemicReportUserInfoDTO> page(Map<String, Object> params) {
-//        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
         IPage<EpidemicReportUserInfoDTO> page = getPage(params);
         List<EpidemicReportUserInfoDTO> list = baseDao.getEpidemicUserInfoList(params);
         for (EpidemicReportUserInfoDTO eru : list) {
@@ -88,34 +87,6 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl<EpidemicR
 
     @Override
     public Result updateUserInfo(EpidemicUserInfoUpdateDTO dto) {
-//        //1.校验 身份证号
-//        String idCard = dto.getIdCard();
-//        //手机号
-//        String mobile = dto.getMobile();
-//        Long id = dto.getId();
-//        if (StringUtils.isEmpty(idCard)) {
-//            return new Result().error("请输入身份证号");
-//        }
-//        if (StringUtils.isEmpty(mobile)) {
-//            return new Result().error("请输入手机号");
-//        }
-//        String s = fixAndCheckIdentityNo(idCard);
-//        dto.setIdCard(s);
-//        //2、根据身份证号，手机号进行唯一性判断
-//        List<EpidemicReportUserInfoEntity> list = baseDao.selectUserInfoByNumber(id,mobile,idCard);
-//        if (list.size() >0) {
-//            if (StringUtils.isNotBlank(mobile)) {
-//                for (EpidemicReportUserInfoEntity entity : list) {
-//                    if (!id.equals(entity.getId())) {
-//                        if (StringUtils.isNotBlank(entity.getMobile()) && mobile.equals(entity.getMobile())) {
-//                            throw new RenException("手机号码已被注册");
-//                        }
-//                    }
-//                }
-//            }
-//            throw new RenException("身份证号码已被注册");
-//        }
-
         EpidemicReportUserInfoDTO infoDTO = new EpidemicReportUserInfoDTO();
         BeanUtils.copyProperties(dto, infoDTO);
         this.update(infoDTO);
@@ -187,7 +158,6 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl<EpidemicR
 
     @Override
     public List<EpidemicReportUserInfoDTO> list(Map<String, Object> params) {
-//        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
         List<EpidemicReportUserInfoDTO> list = baseDao.getEpidemicUserInfoList(params);
         for (EpidemicReportUserInfoDTO eru : list) {
             eru.setIdCard(idEncrypt(eru.getIdCard()));
@@ -673,10 +643,7 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl<EpidemicR
      */
     private Boolean checkNullCell(EpidemicReportUserInfoAllExcel infoAllExcel) {
         // 校验必填项 (用户名、身份证号)
-        if (StringUtils.isBlank(infoAllExcel.getUserName()) || StringUtils.isBlank(infoAllExcel.getIdCard())) {
+        return StringUtils.isBlank(infoAllExcel.getUserName()) || StringUtils.isBlank(infoAllExcel.getIdCard());
-            return true;
-        }
-        return false;
     }
 
 }

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

@@ -167,11 +167,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             result.setAllDeptIds(result.getAllDeptIds().replace(result.getAllDeptIds().substring(0, result.getAllDeptIds().indexOf(",") + 1), ""));
             result.setDeptIdList(result.getAllDeptIds().split(","));
         }
-//        result.setIdCard(idEncrypt(result.getIdCard()));
-//        result.setMobile(mobileEncrypt(result.getMobile()));
         result.setUserName(nameDesensitization(result.getUserName()));
         result.setRelationPeople(nameDesensitization(result.getRelationPeople()));
-//        result.setRelationPeopleMobile(mobileEncrypt(result.getRelationPeopleMobile()));
         if (StringUtils.isNotBlank(result.getHouseholdRegisterCode())) {
             result.setHouseholdRegisterCodes(result.getHouseholdRegisterCode().split(","));
         } else {
@@ -201,6 +198,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         } else {
             result.setDestinationAddressCodes(new String[]{});
         }
+
+        // 查询房屋关联信息
         EpidemicBuildingUnitDTO formDTO = new EpidemicBuildingUnitDTO();
         formDTO.setIdCard(result.getIdCard());
         EpidemicBuildingUnitDetailResultDTO unitInfo = epidemicBuildingUnitService.getUnitInfo(formDTO);
@@ -1697,6 +1696,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         EpidemicUnitOwnerEntity epidemicUnitOwnerEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUnitOwnerEntity.class);
         epidemicUnitOwnerEntity.setOwnerName(formDTO.getUserName());
         epidemicUnitOwnerEntity.setAddress(formDTO.getHouseAddress());
+        epidemicUnitOwnerEntity.setId(null);
         epidemicUnitOwnerService.deletePhysicalByIdCardAndUnitId(formDTO.getIdCard(), formDTO.getUnitId());
         epidemicUnitOwnerService.insert(epidemicUnitOwnerEntity);
 
@@ -1708,6 +1708,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         EpidemicUnitOwnerEntity epidemicUnitOwnerEntity = ConvertUtils.sourceToTarget(dto, EpidemicUnitOwnerEntity.class);
         epidemicUnitOwnerEntity.setOwnerName(dto.getUserName());
         epidemicUnitOwnerEntity.setAddress(dto.getHouseAddress());
+        epidemicUnitOwnerEntity.setId(null);
         epidemicUnitOwnerService.deletePhysicalByIdCardAndUnitId(dto.getIdCard(), dto.getUnitId());
         epidemicUnitOwnerService.insert(epidemicUnitOwnerEntity);
     }

epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml

@@ -286,11 +286,12 @@
             pb.PLOT_ID,
             pc.PLOT_NAME
         FROM
-            epidemic_building_unit bu
+            epidemic_unit_owner o
+            LEFT JOIN epidemic_building_unit bu ON o.UNIT_ID = bu.id
             LEFT JOIN epidemic_plot_building pb ON bu.BUILDING_ID = pb.ID
             LEFT JOIN epidemic_plot_coordinate pc ON pb.PLOT_ID = pc.ID
         WHERE
-            bu.ID_CARD =  #{idCard}
+            o.ID_CARD = #{idCard}
         ORDER BY
             CREATED_TIME DESC
             LIMIT 1