Browse Source

fix 修改分数计算

Administrator 1 year ago
parent
commit
7bb18b8120

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskService.java

@@ -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())