dev
parent
80861ce523
commit
a62ec3f74d
|
|
@ -149,8 +149,6 @@ public class InvoiceUseService {
|
||||||
list = Db.find(ordsql + " order by t.create_time", paramord.toArray());
|
list = Db.find(ordsql + " order by t.create_time", paramord.toArray());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
paramlog.addAll(paramord);
|
|
||||||
|
|
||||||
List<Record> l1 = Db.find(logsql + " order by t.create_time", paramlog.toArray());
|
List<Record> l1 = Db.find(logsql + " order by t.create_time", paramlog.toArray());
|
||||||
List<Record> l2 = Db.find(ordsql + " order by t.create_time", paramord.toArray());
|
List<Record> l2 = Db.find(ordsql + " order by t.create_time", paramord.toArray());
|
||||||
|
|
||||||
|
|
@ -168,9 +166,7 @@ public class InvoiceUseService {
|
||||||
}
|
}
|
||||||
|
|
||||||
for(Map.Entry<String, Record> entry : map2.entrySet()){
|
for(Map.Entry<String, Record> entry : map2.entrySet()){
|
||||||
if(map1.containsKey(entry.getKey())){
|
map1.remove(entry.getKey()); // 从 map1 中移除相同的
|
||||||
map1.remove(entry.getKey()); // 从 map1 中移除相同的
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
map2.putAll(map1); // 剩下的不同的全部加到 map2 中
|
map2.putAll(map1); // 剩下的不同的全部加到 map2 中
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue