人房管理代码迁移

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java

@@ -213,7 +213,6 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
 
     @Override
     public Result importBuilding(MultipartFile file) {
-        log.info("+++++++++++进入导入方法");
         // 文件基本信息检查
         AllDeptDTO allDeptInfo = checkInfo(file);
 
@@ -224,14 +223,12 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
             ImportParams importParams = new ImportParams();
             // excel数据
             List<EpidemicPlotBuildingImportExcel> recordList = ExcelImportUtil.importExcel(f, EpidemicPlotBuildingImportExcel.class, importParams);
-            log.info("+++++++++++转成功");
             // 未成功匹配数据
             List<EpidemicPlotBuildingImportExcel> nonExistInfoList = new ArrayList<>();
 
             //字典类型数据
             // 楼栋状态全部取出
             List<SysSimpleDictDTO> buildingStateList = adminFeignClient.listSimpleDictInfo("building_state").getData();
-            log.info("+++++++++++漏洞状态"+buildingStateList.get(0).getDictName());
             List<String> buildingStateCodeList = buildingStateList.stream().map(SysSimpleDictDTO::getDictValue).collect(Collectors.toList());
             // 楼栋类型全部取出
             List<SysSimpleDictDTO> buildingTypeList = adminFeignClient.listSimpleDictInfo("building_type").getData();
@@ -487,7 +484,7 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
         }
         //因为现在数据库没有网格编码的档案，所以第一次要更新网格的编码
         String gridCode = fileNameArr[fileNameArr.length - 1];
-        if(StringUtils.isNotBlank(gridCode) &&  gridCode.length() == 19 && gridCode.startsWith("370124") ){
+        if(StringUtils.isNotBlank(gridCode) &&  gridCode.length() == 12 && gridCode.startsWith("370124") ){
 //            SysDeptEntity deptEntity = sysDeptDao.selectById(allDeptInfo.getGridId());
 //            if(StringUtils.isBlank(deptEntity.getDeptCode())){
 //                deptEntity.setDeptCode(gridCode);