积分优化

cloud-point/src/main/java/com/yizhi/application/constant/PointChangeReasonConstant.java

@@ -5,7 +5,7 @@ public enum PointChangeReasonConstant {
     CREDITEXAMDONE("CreditExamDone", "考试阅卷通过"),
     CREDITEXAMDONE("CreditExamDone", "考试阅卷通过"),
     CREDITCOURSEDONE1("CreditCourseDone1", "课程学习完成"),
     CREDITCOURSEDONE1("CreditCourseDone1", "课程学习完成"),
     CREDITEXAMPASSED("CreditExamPassed", "考试通过"),
     CREDITEXAMPASSED("CreditExamPassed", "考试通过"),
-    CREDITRESEARCHDONE("CreditResearchDone", "调研通过"),
+    CREDITRESEARCHDONE("CreditResearchDone", "投票通过"),
     CREDITCOURSECHAPTERDONE("CreditCourseChapterDone", "课程章节完成"),
     CREDITCOURSECHAPTERDONE("CreditCourseChapterDone", "课程章节完成"),
     CREDITASSIGNMENTPASSED("CreditAssignmentPassed", "作业通过"),
     CREDITASSIGNMENTPASSED("CreditAssignmentPassed", "作业通过"),
     CREDITQUIZPASSED("CreditQuizPassed", "课程章节测验通过"),
     CREDITQUIZPASSED("CreditQuizPassed", "课程章节测验通过"),
@@ -17,7 +17,11 @@ public enum PointChangeReasonConstant {
     CREDITFORUMINVITATION("CreditForumInvitation", "发布论坛帖子发放积分"),
     CREDITFORUMINVITATION("CreditForumInvitation", "发布论坛帖子发放积分"),
     CREDITFORUMCOMMENT("CreditForumComment", "发布论坛回复发放积分"),
     CREDITFORUMCOMMENT("CreditForumComment", "发布论坛回复发放积分"),
     CREDITCALENDARDONE("CreditClendarDone", "签到打卡成功"),
     CREDITCALENDARDONE("CreditClendarDone", "签到打卡成功"),
-    CREDITSIGNDONE("CreditSignDone", "项目签到成功");
+    CREDITSIGNDONE("CreditSignDone", "项目签到成功"),
+    POINT_LOGIN("point_login","登录"),
+    POINT_READ("point_read","阅读文章"),
+    POINT_DRAFT("point_draft","我要投稿"),
+    POINT_COMMENT("point_comment","发表评论");
 
 
     // key
     // key
     private String key;
     private String key;

cloud-point/src/main/java/com/yizhi/application/service/impl/PointDetailsServiceImpl.java

@@ -111,6 +111,9 @@ public class PointDetailsServiceImpl extends ServiceImpl<PointDetailsMapper, com
         Page<PointDetailsVO> page = new Page<PointDetailsVO>(pageNo, pageSize);
         Page<PointDetailsVO> page = new Page<PointDetailsVO>(pageNo, pageSize);
         List<PointDetailsVO> list1 = pointDetailsMapper.aMonthList(page, year, type, accountId, companyId, siteId, null);
         List<PointDetailsVO> list1 = pointDetailsMapper.aMonthList(page, year, type, accountId, companyId, siteId, null);
         List<PointDetailsVO> pointList = list1.parallelStream().map(pointDetailsVO -> {
         List<PointDetailsVO> pointList = list1.parallelStream().map(pointDetailsVO -> {
+            if(pointDetailsVO.getLearnType()==null){
+                pointDetailsVO.setLearnType("");
+            }
             log.info("类型：" + pointDetailsVO.getLearnType());
             log.info("类型：" + pointDetailsVO.getLearnType());
             if (pointDetailsVO.getLearnType().contains(PointChangeReasonConstant.CREDITEXAMDONE.getValue())) {
             if (pointDetailsVO.getLearnType().contains(PointChangeReasonConstant.CREDITEXAMDONE.getValue())) {
                 // 考试阅卷通过
                 // 考试阅卷通过