添加筛选

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import java.lang.reflect.Array;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,20 +54,35 @@ public class TdHygfJpInverterWarnServiceImpl
 			String[] s = tdHygfJpInverterWarnDto.getState().split(",");
 			tdHygfJpInverterWarnDto.setStates(Arrays.asList(s));
 		}
-		List<TdHygfJpInverterWarnDto> list = this.baseMapper.list(tdHygfJpInverterWarnDto);
-		if (!list.isEmpty()) {
-			list.forEach(i -> {
-				JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
-						.eq(JpStation::getThirdStationId, i.getThirdStationId()));
-				if (jpStation != null) {
-					i.setAddress(jpStation.getAddress());
-					i.setStationName(jpStation.getName());
-					i.setArea(jpStation.getArea());
-				}
-				if (i.getStartTime() != null) {
-					i.setStartTimeFormat(TimeUtil.dateFormat(i.getStartTime()));
-				}
-			});
+		if (tdHygfJpInverterWarnDto.getStationName() != null) {
+			LambdaQueryWrapper<JpStation> wapper = new LambdaQueryWrapper<JpStation>().like(JpStation::getName,
+					tdHygfJpInverterWarnDto.getStationName());
+			if (!tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
+				wapper.in(JpStation::getThirdStationId, tdHygfJpInverterWarnDto.getStationIds());
+			}
+			List<JpStation> sList = jpStationServiceImpl.list(wapper);
+			List<String> ids = sList.stream().map(i -> i.getThirdStationId()).collect(Collectors.toList());
+			tdHygfJpInverterWarnDto.setStationIds(ids);
+		}
+		List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
+		if (tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
+
+		} else {
+			list = this.baseMapper.list(tdHygfJpInverterWarnDto);
+			if (!list.isEmpty()) {
+				list.forEach(i -> {
+					JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
+							.eq(JpStation::getThirdStationId, i.getThirdStationId()));
+					if (jpStation != null) {
+						i.setAddress(jpStation.getAddress());
+						i.setStationName(jpStation.getName());
+						i.setArea(jpStation.getArea());
+					}
+					if (i.getStartTime() != null) {
+						i.setStartTimeFormat(TimeUtil.dateFormat(i.getStartTime()));
+					}
+				});
+			}
 		}
 		PageInfo<TdHygfJpInverterWarnDto> page = new PageInfo(list);
 		com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto>();