Commit dcbadccee9bf31b9b3c1348766b1e3d3af09e788

Authored by youxiw2000
1 parent f6d54f73

1

src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
@@ -987,9 +987,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ @@ -987,9 +987,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ
987 // 返回值String 987 // 返回值String
988 String stationRStr = ""; 988 String stationRStr = "";
989 // windows下的文本文件换行符 989 // windows下的文本文件换行符
990 - String enterStr = "\r\n"; 990 +// String enterStr = "\r\n";
991 // linux/unix下的文本文件换行符 991 // linux/unix下的文本文件换行符
992 -// String enterStr = "\r"; 992 + String enterStr = "\r";
993 int defaultZdxh = 0; 993 int defaultZdxh = 0;
994 if(objects.size()>0) { 994 if(objects.size()>0) {
995 for(int i = 0; i<objects.size();i++) { 995 for(int i = 0; i<objects.size();i++) {
@@ -1212,9 +1212,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -1212,9 +1212,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
1212 public String hxTextFileToFtp(List<Object[]> objects,Integer lineId) { 1212 public String hxTextFileToFtp(List<Object[]> objects,Integer lineId) {
1213 String restStr = ""; 1213 String restStr = "";
1214 // windows下的文本文件换行符 1214 // windows下的文本文件换行符
1215 - String enterStr = "\r\n"; 1215 +// String enterStr = "\r\n";
1216 // linux/unix下的文本文件换行符 1216 // linux/unix下的文本文件换行符
1217 -// String enterStr = "\r"; 1217 + String enterStr = "\r";
1218 int xh = 1 ; 1218 int xh = 1 ;
1219 for(int x =0;x<2;x++) { 1219 for(int x =0;x<2;x++) {
1220 for(int i = 0; i<objects.size();i++) { 1220 for(int i = 0; i<objects.size();i++) {