feature 支持多选

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum7.java

@@ -5,6 +5,7 @@ import com.rongwei.bscommon.sys.service.impl.JtWyysServiceImpl;
 import com.rongwei.bsentity.domain.*;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.BaseDo;
+import com.rongwei.rwcommon.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58,7 +59,7 @@ public class ScoreCalculationServiceNum7 implements ScoreCalculationService {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         // 基础资料验证
-        List<JtWyys> jczlList = ztfapsList.stream().filter(info -> JCZL.equals(info.getYzlx())).collect(Collectors.toList());
+        List<JtWyys> jczlList = ztfapsList.stream().filter(info -> StringUtils.isNotBlank(info.getYzlx()) && info.getYzlx().contains(JCZL)).collect(Collectors.toList());
         List<String> jczlProjectName = jczlList.stream()
                 .filter(info -> info.getZlyzsj() == null)
                 .map(JtWyys::getXmmc).distinct()
@@ -72,7 +73,7 @@ public class ScoreCalculationServiceNum7 implements ScoreCalculationService {
             }
         }
         // 外业验收资料
-        List<JtWyys> wyysList = ztfapsList.stream().filter(info -> WYYS.equals(info.getYzlx())).collect(Collectors.toList());
+        List<JtWyys> wyysList = ztfapsList.stream().filter(info ->  StringUtils.isNotBlank(info.getYzlx()) && info.getYzlx().contains(WYYS)).collect(Collectors.toList());
         List<String> xcyzProjectName = wyysList.stream()
                 .filter(info -> info.getXcyzsj() == null)
                 .map(JtWyys::getXmmc).distinct()