2 Commits

View File

@@ -279,12 +279,10 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
.otherwise(0L) .otherwise(0L)
.sum(); .sum();
if (StringUtils.isNotBlank(req.getModelNo())) { if (req.getModelNo().equals(ModelType.G2.getId())) {
if (req.getModelNo().equals(ModelType.G2.getId())) { selectedCnt = wasteCnt;
selectedCnt = wasteCnt; } else {
} else if (req.getModelNo().equals(ModelType.G3.getId())) { selectedCnt = elseCnt;
selectedCnt = elseCnt;
}
} }
if (StringUtils.isNotBlank(req.getDataType())) { if (StringUtils.isNotBlank(req.getDataType())) {