fix 标准预警查询Bug

This commit is contained in:
liao
2023-11-03 13:37:12 +08:00
parent 6910dc3a81
commit 27dda36f68
@@ -11,7 +11,9 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
@@ -66,14 +68,24 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa
// 新车型实施日期
if (StringUtils.isNotBlank(standardEarlyWarning.getNewModelImplementationDate())) {
List<String> eStrings = Arrays.asList(warning.getNewModelImplementationDate().split(","));
eStrings.retainAll(dayStrings); // 删除eStrings中与dayStrings不相同的元素
warning.setNewModelImplementationDate(eStrings.get(0));
List<String> intersection = new ArrayList<>();
for (String item : dayStrings) {
if (eStrings.contains(item)) {
intersection.add(item);
}
}
warning.setNewModelImplementationDate(intersection.get(0));
}
// 在产车实施日期
if (StringUtils.isNotBlank(standardEarlyWarning.getOnTheProductionDate())) {
List<String> eStrings = Arrays.asList(warning.getOnTheProductionDate().split(","));
eStrings.retainAll(dayStrings); // 删除eStrings中与dayStrings不相同的元素
warning.setOnTheProductionDate(eStrings.get(0));
List<String> intersection = new ArrayList<>();
for (String item : dayStrings) {
if (eStrings.contains(item)) {
intersection.add(item);
}
}
warning.setOnTheProductionDate(intersection.get(0));
}
});
return pageList;