Commit fb7b2215 authored by wdy's avatar wdy

计算

parent e50a5eba
...@@ -7,6 +7,7 @@ import com.ruoyi.mapper.TaskMapper; ...@@ -7,6 +7,7 @@ import com.ruoyi.mapper.TaskMapper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
public class DataStatisticsUtils { public class DataStatisticsUtils {
...@@ -31,7 +32,7 @@ public class DataStatisticsUtils { ...@@ -31,7 +32,7 @@ public class DataStatisticsUtils {
isPass = false; isPass = false;
} }
if(passed == ReviewStandard.NO_PASSED) { if(Objects.equals(passed, ReviewStandard.NO_PASSED)) {
isPass = false; isPass = false;
} }
...@@ -62,7 +63,7 @@ public class DataStatisticsUtils { ...@@ -62,7 +63,7 @@ public class DataStatisticsUtils {
isPass = false; isPass = false;
} }
if(passed == ReviewStandard.NO_PASSED) { if(Objects.equals(passed, ReviewStandard.NO_PASSED)) {
isPass = true; isPass = true;
} }
...@@ -106,7 +107,7 @@ public class DataStatisticsUtils { ...@@ -106,7 +107,7 @@ public class DataStatisticsUtils {
continue; continue;
} }
if(detailsIsPass(reviewDetails, resultMap) == ReviewStandard.PASSED) { if(Objects.equals(detailsIsPass(reviewDetails, resultMap), ReviewStandard.PASSED)) {
detailsPass = detailsPass + 1; detailsPass = detailsPass + 1;
} }
} }
...@@ -124,7 +125,7 @@ public class DataStatisticsUtils { ...@@ -124,7 +125,7 @@ public class DataStatisticsUtils {
List<ReviewDetails> details = getDetailsByStandard(standard); List<ReviewDetails> details = getDetailsByStandard(standard);
for(ReviewDetails reviewDetails : details) { for(ReviewDetails reviewDetails : details) {
if(detailsIsPass(reviewDetails, resultMap) == ReviewStandard.NO_PASSED) { if(Objects.equals(detailsIsPass(reviewDetails, resultMap), ReviewStandard.NO_PASSED)) {
detailsNoPass = detailsNoPass + 1; detailsNoPass = detailsNoPass + 1;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment