Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java

@@ -122,18 +122,12 @@ public class IcResiImportDynamicExcelListener extends AnalysisEventListener<Map<
         // 合并多级表头到一个list中，key为列序号
         Map<Integer, List<String>> headers = icResiUserImportService.mergeMultiLevelHeadLabels(headList);
 
-        icResiUserImportService.printLog("invokeHeadMap_1_" + isPrimary);
-
         // 清洗表头数据,通过items剔除，并且得到options
         abandonedHeaders = icResiUserImportService.removeAndGetOptionsFromHeaders(headers, formItemList);
 
-        icResiUserImportService.printLog("invokeHeadMap_2_" + isPrimary);
-
         // 交换表头信息，以label连起来的string作为key，列号的列表作为value
         HashMap<String, List<Integer>> combinedHeaders = icResiUserImportService.exchangeKeyAndValueOfHeaders(headers);
 
-        icResiUserImportService.printLog("invokeHeadMap_3_" + isPrimary);
-
         // 得到客户配置item数据。<"兴趣爱好:兴趣特长", item对象>
         Map<String, FormItemResult> customizedLabelCompbinedItemsMap = formItemList.stream().collect(
                 Collectors.toMap(formItem -> {
@@ -147,11 +141,7 @@ public class IcResiImportDynamicExcelListener extends AnalysisEventListener<Map<
                 }, formItem -> formItem)
         );
 
-        icResiUserImportService.printLog("invokeHeadMap_4_" + isPrimary);
-
         itemIdAndColumnWrapper = icResiUserImportService.convertExcelHeaders2DBColumnWrappers(customizedLabelCompbinedItemsMap, combinedHeaders);
-
-        icResiUserImportService.printLog("invokeHeadMap_5_" + isPrimary);
     }
 
     /**
@@ -182,7 +172,6 @@ public class IcResiImportDynamicExcelListener extends AnalysisEventListener<Map<
         if (dataList.size() != 0) {
             execPersistant();
         }
-        icResiUserImportService.printLog("invokeHeadMap_doAfterAllAnalysed_" + isPrimary);
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -415,8 +415,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                                        String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel,
                                        String currUserAgencyPids, String currentUserId, String tableName) {
 
-        //this.printLog("persistIcResiBaseInfo");
-
         // 遍历每一行，将行内容转化为
         for (Map<Integer, String> row : dataRows) {
 
@@ -996,8 +994,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         }
 
         List<OptionResultDTO> options = null;
-
-        //this.printLog("listRemoteOptions");
         switch (pureUri) {
             case "/epmetuser/icresidemanddict/demandoption":
                 options = getResultDataOrThrowsException(epmetUserOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,