Browse Source

excel修改

yangzian 3 years ago
parent
commit
de4f869af0

+ 58 - 51
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/listener/ImportExcelListener.java

@@ -38,64 +38,71 @@ public class ImportExcelListener extends AnalysisEventListener<Map<Integer, Stri
 
         Map<String, String> ObjectMap = new HashMap<>();
 
-        log.info("解析到的一条数据=====excelRow = {}", JSON.toJSONString(data));
+        String dataStr = JSON.toJSONString(data);
 
-        data.forEach((key,vlue) ->{
-            Object mapKey = importHeadList.get(key);
-            if (StringUtils.isNotNull(mapKey)){
+        log.info("解析到的一条数据=====excelRow = {}", JSON.toJSONString(data));
 
-                String keyStr = (String)mapKey;
-                keyStr.replace(" ","");
+        if (!dataStr.isEmpty() && !StringUtils.equals(dataStr,"{}")){
+            data.forEach((key,vlue) ->{
+                Object mapKey = importHeadList.get(key);
+                if (StringUtils.isNotNull(mapKey)){
+
+                    String keyStr = (String)mapKey;
+                    keyStr.replace(" ","");
+
+                    if (StringUtils.isNotNull(vlue)){
+                        vlue = vlue.replace(" ","");
+                    }
+
+                    if (keyStr.contains("家ID")){
+                        ObjectMap.put("sellerId",vlue);
+                    }
+                    if (keyStr.contains("昵称")){
+                        ObjectMap.put("sellerName",vlue);
+                    }
+                    if (keyStr.contains("粉丝")){
+                        ObjectMap.put("fans",vlue);
+                    }
+                    if (keyStr.contains("行业")){
+                        ObjectMap.put("industryId",vlue);
+                    }
+                    if (keyStr.contains("省份")){
+                        ObjectMap.put("provinceId",vlue);
+                    }
+                    if (keyStr.contains("城市")){
+                        ObjectMap.put("cityId",vlue);
+                    }
+                    if (keyStr.contains("联系")){
+                        ObjectMap.put("telephone",vlue);
+                    }
+                    if (keyStr.contains("服务商")){
+                        //ObjectMap.put("providerFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
+                        ObjectMap.put("providerFlag",vlue);
+                    }
+                    if (keyStr.contains("跃迁")){
+                        //ObjectMap.put("transitionFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
+                        ObjectMap.put("transitionFlag",vlue);
+                    }
+                    if ((keyStr).contains("30天")){
+                        ObjectMap.put("NearlyThirtyDays",vlue);
+                    }
+
+                    if ((keyStr).contains("gmv") || (keyStr).contains("GMV")){
+                        ObjectMap.put("gmvMonth",keyStr.substring(0,keyStr.length()-3));
+                        ObjectMap.put("gmv",vlue);
+                    }
+
+                    if (keyStr.contains("mtd") || keyStr.contains("MTD")){
+                        ObjectMap.put("mtdDate",keyStr.substring(0,keyStr.length()-3));
+                        ObjectMap.put("mtd",vlue);
+                    }
 
-                if (StringUtils.isNotNull(vlue)){
-                    vlue = vlue.replace(" ","");
                 }
+            });
 
-                if (keyStr.contains("家ID")){
-                    ObjectMap.put("sellerId",vlue);
-                }
-                 if (keyStr.contains("昵称")){
-                    ObjectMap.put("sellerName",vlue);
-                }
-                if (keyStr.contains("粉丝")){
-                    ObjectMap.put("fans",vlue);
-                }
-                if (keyStr.contains("行业")){
-                    ObjectMap.put("industryId",vlue);
-                }
-                if (keyStr.contains("省份")){
-                    ObjectMap.put("provinceId",vlue);
-                }
-                if (keyStr.contains("城市")){
-                    ObjectMap.put("cityId",vlue);
-                }
-                if (keyStr.contains("联系")){
-                    ObjectMap.put("telephone",vlue);
-                }
-                if (keyStr.contains("服务商")){
-                    //ObjectMap.put("providerFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
-                    ObjectMap.put("providerFlag",vlue);
-                }
-                if (keyStr.contains("跃迁")){
-                    //ObjectMap.put("transitionFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
-                    ObjectMap.put("transitionFlag",vlue);
-                }
-                if ((keyStr).contains("30天")){
-                    ObjectMap.put("NearlyThirtyDays",vlue);
-                }
+        }
 
-                if ((keyStr).contains("gmv") || (keyStr).contains("GMV")){
-                    ObjectMap.put("gmvMonth",keyStr.substring(0,keyStr.length()-3));
-                    ObjectMap.put("gmv",vlue);
-                }
-
-                if (keyStr.contains("mtd") || keyStr.contains("MTD")){
-                    ObjectMap.put("mtdDate",keyStr.substring(0,keyStr.length()-3));
-                    ObjectMap.put("mtd",vlue);
-                }
 
-            }
-        });
 
         importDataList.add(ObjectMap);
 

+ 1 - 1
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/pojo/SaleClueInfoPojo.java

@@ -54,7 +54,7 @@ public class SaleClueInfoPojo {
     private String cityName;
 
     @ApiModelProperty("联系方式")
-    private Long telephone;
+    private String telephone;
 
     @ApiModelProperty("卖家是否绑定服务商 0-否 1-是'")
     private String providerFlag;

+ 18 - 4
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/service/impl/SaleClueInfoServiceImpl.java

@@ -143,17 +143,31 @@ public class SaleClueInfoServiceImpl implements ISaleClueInfoService {
         List<SaleClueInfoPojo> clueList = new ArrayList<>();
         List<SaleQuotaInfoPojo> quotaList = new ArrayList<>();
         for (Map<String, String> dataMap : dataList) {
-            SaleClueInfoPojo clue = new SaleClueInfoPojo();
-            SaleQuotaInfoPojo quota = new SaleQuotaInfoPojo();
 
-            clue.setSalesLeadsType(salesLeadsType);
+            if(StringUtils.isEmpty(dataMap)){
+                continue;
+            }
+            //log.info("datamap----{}",dataMap);
+
+            if (!dataMap.containsKey("sellerId")){
+                continue;
+            }
+
             if (dataMap.get("sellerId").isEmpty()){
+                //log.info("sellerId----{}",dataMap.get("sellerId"));
                 continue;
             }
+
+
+            SaleClueInfoPojo clue = new SaleClueInfoPojo();
+            SaleQuotaInfoPojo quota = new SaleQuotaInfoPojo();
+
+            clue.setSalesLeadsType(salesLeadsType);
+
             clue.setSellerId(Long.valueOf(dataMap.get("sellerId")));
             clue.setSellerName(dataMap.get("sellerName"));
             clue.setFans(Long.valueOf(dataMap.get("fans")));
-            clue.setTelephone(StringUtils.isEmpty(dataMap.get("telephone")) ? 0 : Long.valueOf(dataMap.get("telephone")));
+            clue.setTelephone(StringUtils.isEmpty(dataMap.get("telephone")) ? "" : dataMap.get("telephone"));
             clue.setProviderFlag(dataMap.get("providerFlag"));
             clue.setTransitionFlag(dataMap.get("transitionFlag"));
             clue.setCreateUserId(createUserId);