Explorar el Código

csv读取修改

yangzian hace 3 años
padre
commit
1498bb74e0

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

@@ -97,6 +97,9 @@ public class SaleClueInfoPojo {
     @ApiModelProperty("第二次跟进情况")
     private SaleClueRecordInfoPojo secondRecord;
 
+    @ApiModelProperty("任务开始时间")
+    private String taskTime;
+
 
 
 

+ 9 - 5
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/utils/CsvImportUtil.java

@@ -58,12 +58,9 @@ public class CsvImportUtil {
             Map<String,String> rowMap = rows.get(i).getFieldMap();
 
             rowMap.forEach((key,vlue)->{
-
+                System.out.println(key);
+                key = key.replace("\"","");
                 switch (key){
-                    case "卖家ID":
-
-                        objectMap.put("sellerId",vlue);
-                        break;
 
 
                     case "卖家昵称":
@@ -111,9 +108,16 @@ public class CsvImportUtil {
                         objectMap.put("transitionFlag",StringUtils.isEmpty(vlue) ? "0" : vlue);
                         break;
 
+
                 }
 
 
+                if ((key).contains("家ID")){
+                    objectMap.put("sellerId",vlue);
+                }
+
+
+
                 if ((key).contains("30天")){
                     objectMap.put("NearlyThirtyDays",vlue);
                 }

+ 3 - 1
ruixuan-salesLeads/src/main/resources/mapper/salesLeads/SaleClueInfoMapper.xml

@@ -136,9 +136,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			s.state,
 			s.offline_sale_flag,
 			s.create_user_id,
-			s.create_time
+			s.create_time,
+			MIN(d.create_time) taskTime
 		FROM
 			sale_clue_info s
+		LEFT JOIN sale_clue_distribution_info d on s.seller_id = d.seller_id
 		<where>
 			<if test="sellerName !=null and sellerName != ''">
 				and (s.seller_name like CONCAT('%', CONCAT(#{sellerName}, '%')) or s.seller_id like CONCAT('%', CONCAT(#{sellerName}, '%')))