|
|
@@ -299,14 +299,13 @@ public class WbsTreeContractController extends BladeController {
|
|
|
for (Map.Entry<String, String> stringStringEntry : stringStringMap.entrySet()) {
|
|
|
String value = stringStringEntry.getValue();
|
|
|
if (StringUtils.isNotEmpty(value)) {
|
|
|
- String escape = CssSelectorEscaper.escape(value);
|
|
|
+ /*String escape = CssSelectorEscaper.escape(value);
|
|
|
String selectorTitle = "td:containsOwn(" + escape + ")";
|
|
|
Elements tdElementsTitle = doc.select(selectorTitle);
|
|
|
//如果找到了匹配的<td>元素，说明是固定的标题，跳过当前循环，只保留填写的excel数据
|
|
|
if (!tdElementsTitle.isEmpty()) {
|
|
|
continue;
|
|
|
- }
|
|
|
-
|
|
|
+ }*/
|
|
|
String[] split = stringStringEntry.getKey().split("_");
|
|
|
int row = Integer.parseInt(split[0]) + 1;
|
|
|
int cell = Integer.parseInt(split[1]) + 1;
|
|
|
@@ -332,8 +331,8 @@ public class WbsTreeContractController extends BladeController {
|
|
|
} else if (value.contains("年") && value.contains("月") && value.contains("日")) {
|
|
|
//解析日期格式是否为单日期格式，那么剔除空格返回
|
|
|
String replace = value.replace(" ", "");
|
|
|
- if (!replace.equals("年月日")) {//如果为空那么返回
|
|
|
- resultDataMap.put(keyName, value.replace(" ", ""));
|
|
|
+ if (!replace.equals("年月日")) {//如果为空那么不返回
|
|
|
+ resultDataMap.put(keyName, replace);
|
|
|
}
|
|
|
} else {
|
|
|
resultDataMap.put(keyName, value);
|
liuyc