fix 修改分数计算

ruoyi-common/src/main/java/com/ruoyi/common/constant/CommonConstants.java

@@ -19,6 +19,8 @@ public class CommonConstants {
     public static final String TEN = "10";
     public static final String ELE = "11";
     public static final String TWE = "12";
+    public static final String YES = "是";
+    public static final String NO = "否";
 
     //角色权限
     //超级管理员

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

@@ -151,7 +151,7 @@ public class TaskService extends Thread {
                         assessmentTotal = zxAssessments.stream().filter(e -> "assessment_proposal".equals(e.getAssessmentProjectId()) && 0 == e.getParentId()).collect(Collectors.toList())
                                 .get(0).getAssessmentTotal();
                         //先去查询这个人是否有个人提案立案
-                        proposalCount = proposalInfos.stream().filter(e -> e.getProposalUserId().equals(userId) && e.getIsJointly().equals(ONE) && !ONE.equals(e.getProposalProgress()) && !THR.equals(e.getProposalProgress())).count();
+                        proposalCount = proposalInfos.stream().filter(e -> e.getProposalUserId().equals(userId) && e.getIsJointly().equals(NO) && !ONE.equals(e.getProposalProgress()) && !THR.equals(e.getProposalProgress())).count();
                         if (proposalCount > 0) {
                             //获取对应类型的分值
                             assessmentScore = zxAssessments.stream().filter(e -> "assessment_proposal".equals(e.getAssessmentProjectId()) && ONE.equals(e.getAssessmentTypeId())).collect(Collectors.toList())
@@ -162,7 +162,7 @@ public class TaskService extends Thread {
                         //当前分数小于上限值，继续找下一个条件
                         if (nowScore < assessmentTotal) {
                             //查询这个人是否有个人提案未立案
-                            proposalCount = proposalInfos.stream().filter(e -> e.getProposalUserId().equals(userId) && e.getIsJointly().equals(ONE) && (ONE.equals(e.getProposalProgress()) || THR.equals(e.getProposalProgress()))).count();
+                            proposalCount = proposalInfos.stream().filter(e -> e.getProposalUserId().equals(userId) && e.getIsJointly().equals(NO) && (ONE.equals(e.getProposalProgress()) || THR.equals(e.getProposalProgress()))).count();
                             if (proposalCount > 0) {
                                 //获取对应类型的分值
                                 assessmentScore = zxAssessments.stream().filter(e -> "assessment_proposal".equals(e.getAssessmentProjectId()) && TWO.equals(e.getAssessmentTypeId())).collect(Collectors.toList())
@@ -174,7 +174,7 @@ public class TaskService extends Thread {
                         //当前分数小于上限值，继续找下一个条件
                         if (nowScore < assessmentTotal) {
                             //查询这个人是否有联名提案、集体提案立案的，第一提案人，召集人
-                            proposalCount = proposalInfos.stream().filter(e -> e.getProposalUserId().equals(userId) && "0".equals(e.getIsJointly()) && !ONE.equals(e.getProposalProgress()) && !THR.equals(e.getProposalProgress())).count();
+                            proposalCount = proposalInfos.stream().filter(e -> e.getProposalUserId().equals(userId) && YES.equals(e.getIsJointly()) && !ONE.equals(e.getProposalProgress()) && !THR.equals(e.getProposalProgress())).count();
                             if (proposalCount > 0) {
                                 //获取对应类型的分值
                                 assessmentScore = zxAssessments.stream().filter(e -> "assessment_proposal".equals(e.getAssessmentProjectId()) && THR.equals(e.getAssessmentTypeId())).collect(Collectors.toList())
@@ -186,7 +186,7 @@ public class TaskService extends Thread {
                         //当前分数小于上限值，继续找下一个条件
                         if (nowScore < assessmentTotal) {
                             //查询这个人是否有联名提案、集体提案立案的，其余联名、参与者
-                            proposalCount = proposalInfos.stream().filter(e -> !e.getProposalUserId().equals(userId) && "0".equals(e.getIsJointly()) && !ONE.equals(e.getProposalProgress()) && !THR.equals(e.getProposalProgress())).count();
+                            proposalCount = proposalInfos.stream().filter(e -> !e.getProposalUserId().equals(userId) && YES.equals(e.getIsJointly()) && !ONE.equals(e.getProposalProgress()) && !THR.equals(e.getProposalProgress())).count();
                             if (proposalCount > 0) {
                                 //获取对应类型的分值
                                 assessmentScore = zxAssessments.stream().filter(e -> "assessment_proposal".equals(e.getAssessmentProjectId()) && FOR.equals(e.getAssessmentTypeId())).collect(Collectors.toList())
@@ -198,7 +198,7 @@ public class TaskService extends Thread {
                         //当前分数小于上限值，继续找下一个条件
                         if (nowScore < assessmentTotal) {
                             //查询这个人是否有未立案联名提案、集体提案参与者
-                            proposalCount = proposalInfos.stream().filter(e -> !e.getProposalUserId().equals(userId) && "0".equals(e.getIsJointly()) && (ONE.equals(e.getProposalProgress()) || THR.equals(e.getProposalProgress()))).count();
+                            proposalCount = proposalInfos.stream().filter(e -> !e.getProposalUserId().equals(userId) && YES.equals(e.getIsJointly()) && (ONE.equals(e.getProposalProgress()) || THR.equals(e.getProposalProgress()))).count();
                             if (proposalCount > 0) {
                                 //获取对应类型的分值
                                 assessmentScore = zxAssessments.stream().filter(e -> "assessment_proposal".equals(e.getAssessmentProjectId()) && FOR.equals(e.getAssessmentTypeId())).collect(Collectors.toList())
@@ -255,14 +255,17 @@ public class TaskService extends Thread {
                                 .get(0).getAssessmentTotal();
                         //定义当前分数
                         nowScore = 0L;
+                        //查询这个人是否有全体会议期间是否有未读的，算扣分
                         //查询这个人是否有全体会议期间，无故缺席大会或分组讨论，请假未通过
                         List<ZxConference> collect = zxConferences.stream().filter(e -> e.getConferenceType().equals(ONE)).collect(Collectors.toList());
                         if (collect.size() > 0) {
+                            proposalCount = 0L;
                             for (ZxConference conference : collect) {
                                 List<ZxConferenceUser> zxConferenceUserList = conference.getZxConferenceUserList();
                                 if (zxConferenceUserList != null && zxConferenceUserList.size() > 0) {
                                     //获取到不参加会议的数量
                                     proposalCount = proposalCount + zxConferenceUserList.stream().filter(e -> "N".equals(e.getIsJoin()) && THR.equals(e.getApproval())).count();
+                                    proposalCount = proposalCount + proposalCount + zxConferenceUserList.stream().filter(e -> e.getIsJoin() == null).count();
                                 }
                             }
                             if (proposalCount > 0) {
@@ -276,11 +279,13 @@ public class TaskService extends Thread {
                         //查询这个人是否无故缺席市政协办公室，各专委会，各界别组织召开的其他会议和学习培训活动
                         List<ZxConference> collectTwo = zxConferences.stream().filter(e -> !e.getConferenceType().equals(ONE)).collect(Collectors.toList());
                         if (collectTwo.size() > 0) {
+                            proposalCount = 0L;
                             for (ZxConference conference : collectTwo) {
                                 List<ZxConferenceUser> zxConferenceUserList = conference.getZxConferenceUserList();
                                 if (zxConferenceUserList != null && zxConferenceUserList.size() > 0) {
                                     //获取到不参加会议的数量
                                     proposalCount = proposalCount + zxConferenceUserList.stream().filter(e -> "N".equals(e.getIsJoin()) && THR.equals(e.getApproval())).count();
+                                    proposalCount = proposalCount + zxConferenceUserList.stream().filter(e -> e.getIsJoin() == null).count();
                                 }
                             }
                             if (proposalCount > 0) {
@@ -342,14 +347,14 @@ public class TaskService extends Thread {
                                 //判断是否参加过对应活动
                                 String assessmentTypeId = zxAssessment.getAssessmentTypeId();
                                 //获取参与数量
-                                proposalCount = zxActivities.stream().filter(e -> e.getActivityType().equals(assessmentTypeId)).count();
-                                if (proposalCount > 0){
+                                proposalCount = zxActivities.stream().filter(e -> e.getActivityType().equals(assessmentTypeId) && "Y".equals(e.getIsJoin())).count();
+                                if (proposalCount > 0) {
                                     if (ONE.equals(assessmentTypeId)) {
                                         memberAssessmentInf.setActivityScdyScore(assessmentScore1);
                                     } else if (TWO.equals(assessmentTypeId)) {
-                                        memberAssessmentInf.setActivityLlzScore(assessmentScore1);
-                                    } else if (THR.equals(assessmentTypeId)) {
                                         memberAssessmentInf.setActivityJbScore(assessmentScore1);
+                                    } else if (THR.equals(assessmentTypeId)) {
+                                        memberAssessmentInf.setActivityLlzScore(assessmentScore1);
                                     } else if (FOR.equals(assessmentTypeId)) {
                                         memberAssessmentInf.setActivityBssScore(assessmentScore1);
                                     }