|
@@ -63,7 +63,7 @@ public class ScoreCalculationServiceNum7 implements ScoreCalculationService {
|
|
.filter(info -> info.getZlyzsj() == null)
|
|
.filter(info -> info.getZlyzsj() == null)
|
|
.map(JtWyys::getXmmc).distinct()
|
|
.map(JtWyys::getXmmc).distinct()
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
- if (jczlProjectName.isEmpty()) {
|
|
|
|
|
|
+ if (!jczlProjectName.isEmpty()) {
|
|
errorMsg = "项目级:以下项目名称:" + String.join(",", jczlProjectName) + " 勘察、测量、水文气象资料验证时间为空 ";
|
|
errorMsg = "项目级:以下项目名称:" + String.join(",", jczlProjectName) + " 勘察、测量、水文气象资料验证时间为空 ";
|
|
finalScore = finalScore.subtract(BigDecimal.valueOf(jczlProjectName.size()));
|
|
finalScore = finalScore.subtract(BigDecimal.valueOf(jczlProjectName.size()));
|
|
if (finalScore.compareTo(BigDecimal.ZERO) <= 0) {
|
|
if (finalScore.compareTo(BigDecimal.ZERO) <= 0) {
|
|
@@ -77,7 +77,7 @@ public class ScoreCalculationServiceNum7 implements ScoreCalculationService {
|
|
.filter(info -> info.getXcyzsj() == null)
|
|
.filter(info -> info.getXcyzsj() == null)
|
|
.map(JtWyys::getXmmc).distinct()
|
|
.map(JtWyys::getXmmc).distinct()
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
- if (xcyzProjectName.isEmpty()) {
|
|
|
|
|
|
+ if (!xcyzProjectName.isEmpty()) {
|
|
errorMsg = errorMsg + "项目级:以下项目名称:" + String.join(",", xcyzProjectName) + " 现场勘察、测量验证时间为空扣1分/项。";
|
|
errorMsg = errorMsg + "项目级:以下项目名称:" + String.join(",", xcyzProjectName) + " 现场勘察、测量验证时间为空扣1分/项。";
|
|
finalScore = finalScore.subtract(BigDecimal.valueOf(xcyzProjectName.size()));
|
|
finalScore = finalScore.subtract(BigDecimal.valueOf(xcyzProjectName.size()));
|
|
if (finalScore.compareTo(BigDecimal.ZERO) <= 0) {
|
|
if (finalScore.compareTo(BigDecimal.ZERO) <= 0) {
|