|
@@ -45,10 +45,8 @@ import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import java.io.*;
|
|
import java.io.*;
|
|
import java.sql.Wrapper;
|
|
import java.sql.Wrapper;
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
@Slf4j
|
|
@Slf4j
|
|
@@ -115,7 +113,17 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
|
|
if(sumList.size()<1){
|
|
if(sumList.size()<1){
|
|
sumList=list;
|
|
sumList=list;
|
|
}else {
|
|
}else {
|
|
- sumList.retainAll(list);
|
|
|
|
|
|
+ Set<String> lowercaseSet1 = sumList.stream()
|
|
|
|
+ .map(String::toLowerCase)
|
|
|
|
+ .collect(Collectors.toSet());
|
|
|
|
+
|
|
|
|
+ Set<String> lowercaseSet2 = list.stream()
|
|
|
|
+ .map(String::toLowerCase)
|
|
|
|
+ .collect(Collectors.toSet());
|
|
|
|
+
|
|
|
|
+ lowercaseSet1.retainAll(lowercaseSet2);
|
|
|
|
+ sumList.clear();
|
|
|
|
+ sumList.addAll(lowercaseSet1);
|
|
if(sumList.size()<1){
|
|
if(sumList.size()<1){
|
|
return Result.OK(nullList);
|
|
return Result.OK(nullList);
|
|
}
|
|
}
|
|
@@ -129,7 +137,17 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
|
|
if(sumList.size()<1){
|
|
if(sumList.size()<1){
|
|
sumList=list;
|
|
sumList=list;
|
|
}else {
|
|
}else {
|
|
- sumList.retainAll(list);
|
|
|
|
|
|
+ Set<String> lowercaseSet1 = sumList.stream()
|
|
|
|
+ .map(String::toLowerCase)
|
|
|
|
+ .collect(Collectors.toSet());
|
|
|
|
+
|
|
|
|
+ Set<String> lowercaseSet2 = list.stream()
|
|
|
|
+ .map(String::toLowerCase)
|
|
|
|
+ .collect(Collectors.toSet());
|
|
|
|
+
|
|
|
|
+ lowercaseSet1.retainAll(lowercaseSet2);
|
|
|
|
+ sumList.clear();
|
|
|
|
+ sumList.addAll(lowercaseSet1);
|
|
if(sumList.size()<1){
|
|
if(sumList.size()<1){
|
|
return Result.OK(nullList);
|
|
return Result.OK(nullList);
|
|
}
|
|
}
|
|
@@ -144,7 +162,17 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
|
|
if(sumList.size()<1){
|
|
if(sumList.size()<1){
|
|
sumList=list;
|
|
sumList=list;
|
|
}else {
|
|
}else {
|
|
- sumList.retainAll(list);
|
|
|
|
|
|
+ Set<String> lowercaseSet1 = sumList.stream()
|
|
|
|
+ .map(String::toLowerCase)
|
|
|
|
+ .collect(Collectors.toSet());
|
|
|
|
+
|
|
|
|
+ Set<String> lowercaseSet2 = list.stream()
|
|
|
|
+ .map(String::toLowerCase)
|
|
|
|
+ .collect(Collectors.toSet());
|
|
|
|
+
|
|
|
|
+ lowercaseSet1.retainAll(lowercaseSet2);
|
|
|
|
+ sumList.clear();
|
|
|
|
+ sumList.addAll(lowercaseSet1);
|
|
if(sumList.size()<1){
|
|
if(sumList.size()<1){
|
|
return Result.OK(nullList);
|
|
return Result.OK(nullList);
|
|
}
|
|
}
|