代码被覆盖掉的质量监检信息

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/MsgLogServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallationQualityImpl.java

@@ -34,6 +34,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -65,6 +66,7 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
 
     //分页查询项目质量监检信息
     private static final String LOOK="查看";
+    private static final String PERENT="0%";
     @Override
     @BusinessIdentify
     @Transactional
@@ -135,15 +137,15 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
                 if (weldDtoList != null && weldDtoList.size ( ) > 0) {
                     //获取焊口信息总条数
                     int sum = weldDtoList.size ( );
-                    //焊口合格数
-                    int qualifiedData = 0;
-                    for (WeldDto weldDto : weldDtoList) {
-                        String superInspecStatus = weldDto.getSuperInspecStatus ( );
-                        if (superInspecStatus.equals ("合格")) {
 
-                            qualifiedData++;
-                        }
-                    }
+                    List<WeldDto> collect = weldDtoList.stream( ).filter(weldDto -> StageEnum.焊接工艺.getName( ).equals(weldDto.getSuperInspecStatus( )) ||
+                            StageEnum.管道耐压.getName( ).equals(weldDto.getSuperInspecStatus( )) ||
+                            StageEnum.敷设质量.getName( ).equals(weldDto.getSuperInspecStatus( )) ||
+                            StageEnum.定位.getName( ).equals(weldDto.getSuperInspecStatus( )) ||
+                            StageEnum.回填.getName( ).equals(weldDto.getSuperInspecStatus( )) ).collect(Collectors.toList( ));
+
+                    //焊口合格数
+                    int qualifiedData = collect.size();
                     //合格率
                     BigDecimal sums = new BigDecimal (sum);
                     BigDecimal qualifiedDatas = new BigDecimal (qualifiedData);