bug修改

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/ResponsibilityIndicatorInfoServiceImpl.java

@@ -35,6 +35,7 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.ims.eval.util.ExcelUtil.readExcel;
@@ -292,6 +293,15 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 			data.put("title", null);
 			return data;
 		}
+		/*List<IndicatorResDTO> ids = indicatorService.listByIds(idList);
+		List<String> s = new ArrayList<>();
+		for (IndicatorResDTO in: ids) {
+				if (!s.contains(in.getIndicatorId())) {
+					s.add(in.getIndicatorId());
+				}
+		}
+		List<String> collect1 = idList.stream().filter(s::contains).collect(Collectors.toList());
+		List<IndicatorResDTO> indicatorResDTOS = indicatorService.getGroupChildCodeByIds(collect1);*/
 		List<IndicatorResDTO> indicatorResDTOS = indicatorService.getGroupChildCodeByIds(idList);
 
 		if (titlemark) {

pom.xml

@@ -17,7 +17,7 @@
         <flowable.version>6.4.2</flowable.version>
         <dubbo.version>2.7.5</dubbo.version>
 
-        <spring.boot.version>2.1.13.RELEASE</spring.boot.version>
+        <spring.boot.version>2.6.7</spring.boot.version>
         <spring.cloud.version>Greenwich.SR5</spring.cloud.version>
         <spring.platform.version>Cairo-SR8</spring.platform.version>
 
@@ -32,6 +32,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
+        <tomcat.version>9.0.52</tomcat.version>
     </properties>
 
     <modules>
@@ -100,6 +101,28 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>${tomcat.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>${tomcat.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-websocket</artifactId>
+            <version>${tomcat.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-annotations-api</artifactId>
+            <version>${tomcat.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>