Commit 4ccb8977915e567f0b2a9c5cd74e8ec62a450e89

Authored by yiming
1 parent 5246455b

加司售卡字段

src/main/java/com/example/demo/service/Contrast.java
@@ -301,7 +301,7 @@ public class Contrast { @@ -301,7 +301,7 @@ public class Contrast {
301 }); 301 });
302 } 302 }
303 303
304 - /*List<List<TJRLDB>> subList2 = getSubList(500, allData); 304 + List<List<TJRLDB>> subList2 = getSubList(500, allData);
305 if(!subList2.isEmpty()){ 305 if(!subList2.isEmpty()){
306 subList2.forEach(data->{ 306 subList2.forEach(data->{
307 if (!data.isEmpty()) { 307 if (!data.isEmpty()) {
@@ -327,7 +327,7 @@ public class Contrast { @@ -327,7 +327,7 @@ public class Contrast {
327 }); 327 });
328 } 328 }
329 }); 329 });
330 - }*/ 330 + }
331 //如果是上次遗留的数据不管这是是否匹配到都清空 331 //如果是上次遗留的数据不管这是是否匹配到都清空
332 if(isOld){ 332 if(isOld){
333 oldData.clear(); 333 oldData.clear();
src/main/resources/mapping/db1/Site-mapper1.xml
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 BUS_PLATE, ROAD_CODE, DEPART_NAME,DEPART_CODE, DEPART_ACTUAL_TIME, 14 BUS_PLATE, ROAD_CODE, DEPART_NAME,DEPART_CODE, DEPART_ACTUAL_TIME,
15 REACH_NAME,REACH_CODE,REACH_ACTUAL_TIME, 15 REACH_NAME,REACH_CODE,REACH_ACTUAL_TIME,
16 LEVELS_FLAG,LEVELS1, LEVELS_NAME1, LEVELS1_CODE,LEVELS2, LEVELS_NAME2,LEVELS2_CODE,MARK,TRAD_ID, 16 LEVELS_FLAG,LEVELS1, LEVELS_NAME1, LEVELS1_CODE,LEVELS2, LEVELS_NAME2,LEVELS2_CODE,MARK,TRAD_ID,
17 - GPS_DATE_TIME1,GPS_DATE_TIME2,B_STATION_ID,PLAN_START_TIME,PLAN_ARRIVE_TIME,ACTUAL_START_TIME,ACTUAL_ARRIVE_TIME,COUNT 17 + GPS_DATE_TIME1,GPS_DATE_TIME2,B_STATION_ID,PLAN_START_TIME,PLAN_ARRIVE_TIME,ACTUAL_START_TIME,ACTUAL_ARRIVE_TIME,COUNT,TJRLDRVCRDID
18 ) 18 )
19 VALUES 19 VALUES
20 <foreach collection="list" item="em" index="index" separator=","> 20 <foreach collection="list" item="em" index="index" separator=",">
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 #{em.REACH_NAME},#{em.REACH_CODE},#{em.REACH_ACTUAL_TIME}, 26 #{em.REACH_NAME},#{em.REACH_CODE},#{em.REACH_ACTUAL_TIME},
27 #{em.LEVELS_FLAG},#{em.LEVELS1}, #{em.LEVELS_NAME1}, #{em.LEVELS1_CODE},#{em.LEVELS2}, #{em.LEVELS_NAME2}, #{em.LEVELS2_CODE}, #{em.MARK},#{em.TRAD_ID}, 27 #{em.LEVELS_FLAG},#{em.LEVELS1}, #{em.LEVELS_NAME1}, #{em.LEVELS1_CODE},#{em.LEVELS2}, #{em.LEVELS_NAME2}, #{em.LEVELS2_CODE}, #{em.MARK},#{em.TRAD_ID},
28 #{em.GPS_DATE_TIME1},#{em.GPS_DATE_TIME2},#{em.B_STATION_ID},#{em.PLAN_START_TIME},#{em.PLAN_ARRIVE_TIME},#{em.ACTUAL_START_TIME},#{em.ACTUAL_ARRIVE_TIME}, 28 #{em.GPS_DATE_TIME1},#{em.GPS_DATE_TIME2},#{em.B_STATION_ID},#{em.PLAN_START_TIME},#{em.PLAN_ARRIVE_TIME},#{em.ACTUAL_START_TIME},#{em.ACTUAL_ARRIVE_TIME},
29 - #{em.COUNT}) 29 + #{em.COUNT},#{em.TJRLDRVCRDID})
30 </foreach> 30 </foreach>
31 </insert> 31 </insert>
32 32