|
|
@@ -4,6 +4,7 @@ import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import com.rwk.common.utils.DateUtils; |
|
|
|
import com.rwk.common.utils.StringUtils; |
|
|
|
import com.rwk.system.domain.RwkMeeting; |
|
|
|
import com.rwk.system.domain.RwkMeetingStaff; |
|
|
|
import com.rwk.system.service.IRwkMeetingService; |
|
|
@@ -197,18 +198,20 @@ public class RwkStaffInformationController extends BaseController |
|
|
|
//对数据换行符进行处理 |
|
|
|
private List<List<String>> splitConversion(String string){ |
|
|
|
List<List<String>> result = new ArrayList<>(); |
|
|
|
String[] lines = string.split("\r\n"); |
|
|
|
for (String line : lines) { |
|
|
|
// 对每一行按空白字符分割,去除前后空格 |
|
|
|
String[] parts = line.trim().split("\\s+"); |
|
|
|
List<String> lineParts = new ArrayList<>(); |
|
|
|
for (String part : parts) { |
|
|
|
if (!part.trim().isEmpty()) { |
|
|
|
lineParts.add(part.trim()); |
|
|
|
if (StringUtils.isNotEmpty(string)){ |
|
|
|
String[] lines = string.split("\r\n"); |
|
|
|
for (String line : lines) { |
|
|
|
// 对每一行按空白字符分割,去除前后空格 |
|
|
|
String[] parts = line.trim().split("\\s+"); |
|
|
|
List<String> lineParts = new ArrayList<>(); |
|
|
|
for (String part : parts) { |
|
|
|
if (!part.trim().isEmpty()) { |
|
|
|
lineParts.add(part.trim()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (!lineParts.isEmpty()) { |
|
|
|
result.add(lineParts); |
|
|
|
} |
|
|
|
} |
|
|
|
if (!lineParts.isEmpty()) { |
|
|
|
result.add(lineParts); |
|
|
|
} |
|
|
|
} |
|
|
|
return result; |
|
|
|