Просмотр исходного кода

销售线索上传-绑定服务商,是否跃迁不做判断

yangzian 3 лет назад
Родитель
Сommit
254aa7dcc2

+ 4 - 2
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/listener/ImportExcelListener.java

@@ -70,10 +70,12 @@ public class ImportExcelListener extends AnalysisEventListener<Map<Integer, Stri
                     ObjectMap.put("telephone",vlue);
                 }
                 if (keyStr.contains("服务商")){
-                    ObjectMap.put("providerFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
+                    //ObjectMap.put("providerFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
+                    ObjectMap.put("providerFlag",vlue);
                 }
                 if (keyStr.contains("跃迁")){
-                    ObjectMap.put("transitionFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
+                    //ObjectMap.put("transitionFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
+                    ObjectMap.put("transitionFlag",vlue);
                 }
                 if ((keyStr).contains("30天")){
                     ObjectMap.put("NearlyThirtyDays",vlue);

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

@@ -57,10 +57,10 @@ public class SaleClueInfoPojo {
     private Long telephone;
 
     @ApiModelProperty("卖家是否绑定服务商 0-否 1-是'")
-    private int providerFlag;
+    private String providerFlag;
 
     @ApiModelProperty("是否跃迁 0-否 1-是'")
-    private int transitionFlag;
+    private String transitionFlag;
 
     @ApiModelProperty("月份")
     private Long uploadDate;

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

@@ -140,8 +140,8 @@ public class SaleClueInfoServiceImpl implements ISaleClueInfoService {
             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.setProviderFlag(dataMap.get("providerFlag").equals("否") ? 0 : 1);
-            clue.setTransitionFlag(dataMap.get("transitionFlag").equals("否") ? 0 : 1 );
+            clue.setProviderFlag(dataMap.get("providerFlag"));
+            clue.setTransitionFlag(dataMap.get("transitionFlag"));
             clue.setCreateUserId(createUserId);
             clue.setUploadDate(uploadDate);
             //查询行业

+ 4 - 2
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/utils/CsvImportUtil.java

@@ -96,10 +96,12 @@ public class CsvImportUtil {
                         objectMap.put("telephone",vlue);
                     }
                     if (keyStr.contains("服务商")){
-                        objectMap.put("providerFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
+                        //objectMap.put("providerFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
+                        objectMap.put("providerFlag",vlue);
                     }
                     if (keyStr.contains("跃迁")){
-                        objectMap.put("transitionFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
+                        //objectMap.put("transitionFlag",StringUtils.isEmpty(vlue) ? "否" : vlue);
+                        objectMap.put("transitionFlag",vlue);
                     }
                     if ((keyStr).contains("30天")){
                         objectMap.put("NearlyThirtyDays",vlue);