diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java index 317d6d9d..1d4692ad 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java @@ -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 eStrings = Arrays.asList(warning.getNewModelImplementationDate().split(",")); - eStrings.retainAll(dayStrings); // 删除eStrings中与dayStrings不相同的元素 - warning.setNewModelImplementationDate(eStrings.get(0)); + List 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 eStrings = Arrays.asList(warning.getOnTheProductionDate().split(",")); - eStrings.retainAll(dayStrings); // 删除eStrings中与dayStrings不相同的元素 - warning.setOnTheProductionDate(eStrings.get(0)); + List intersection = new ArrayList<>(); + for (String item : dayStrings) { + if (eStrings.contains(item)) { + intersection.add(item); + } + } + warning.setOnTheProductionDate(intersection.get(0)); } }); return pageList;