|
@@ -375,7 +375,7 @@ public class TaskService extends Thread {
|
|
|
assessmentTotal = zxAssessments.stream().filter(e -> "assessment_bonus".equals(e.getAssessmentProjectId()) && 0 == e.getParentId()).collect(Collectors.toList())
|
|
|
.get(0).getAssessmentTotal();
|
|
|
|
|
|
- proposalCount = zxInvestments.stream().filter(e -> e.getUserId().equals(userId) && e.getType().equals(TWO)).count();
|
|
|
+ proposalCount = zxInvestments.stream().filter(e -> e.getUserId().equals(userId) && e.getType().equals(ONE)).count();
|
|
|
if (proposalCount > 0) {
|
|
|
|
|
|
assessmentScore = zxAssessments.stream().filter(e -> "assessment_bonus".equals(e.getAssessmentProjectId()) && ONE.equals(e.getAssessmentTypeId())).collect(Collectors.toList())
|
|
@@ -386,7 +386,7 @@ public class TaskService extends Thread {
|
|
|
|
|
|
if (nowScore < assessmentTotal) {
|
|
|
|
|
|
- proposalCount = zxInvestments.stream().filter(e -> e.getUserId().equals(userId) && e.getType().equals(THR)).count();
|
|
|
+ proposalCount = zxInvestments.stream().filter(e -> e.getUserId().equals(userId) && e.getType().equals(TWO)).count();
|
|
|
if (proposalCount > 0) {
|
|
|
|
|
|
assessmentScore = zxAssessments.stream().filter(e -> "assessment_bonus".equals(e.getAssessmentProjectId()) && TWO.equals(e.getAssessmentTypeId())).collect(Collectors.toList())
|