Commit fbc48bfd authored by hongguangwu's avatar hongguangwu

MVP1.6.10工资相关

parent 5e5719ed
...@@ -976,12 +976,13 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -976,12 +976,13 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
if (Common.isNotNull(curValue)) { if (Common.isNotNull(curValue)) {
repetitiveKey.append(key).append(";"); repetitiveKey.append(key).append(";");
} else { } else {
notFixedKeyMap.remove(key);
curMap.put(key, 1); curMap.put(key, 1);
} }
// 存储适配map,以做识别内容 // 存储适配map,以做识别内容
detailMap.put(String.valueOf(title.getLineNum()), entry.getValue()); detailMap.put(String.valueOf(title.getLineNum()), entry.getValue());
notFixedKeyMap.remove(key); // 这里加上截断,就有可能关注不到重复的配置过的表头了:
break; // break
} }
} }
detailSet = detailMap.get(String.valueOf(title.getLineNum())); detailSet = detailMap.get(String.valueOf(title.getLineNum()));
...@@ -1001,7 +1002,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -1001,7 +1002,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
} }
if (notFixedKeyMap.size() > 0) { if (notFixedKeyMap.size() > 0) {
StringBuilder titles = new StringBuilder(); StringBuilder titles = new StringBuilder();
for (String keyStr : notFixedTitleMap.keySet()) { for (String keyStr : notFixedKeyMap.keySet()) {
titles.append(keyStr).append(";"); titles.append(keyStr).append(";");
} }
return R.failed("配置的表头未找到:" + titles); return R.failed("配置的表头未找到:" + titles);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment