fix 修改删除附件

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

@@ -91,22 +91,32 @@ public class TaskService extends Thread {
             long proposalCount = 0L;
             //满分
             long fullScore = 0L;
+            if (zxAssessments != null && zxAssessments.size() > 0) {
+                //计算满分
+                //获取分值上限
+                fullScore = zxAssessments.stream().filter(e -> 0 == e.getParentId()).mapToLong(ZxAssessment::getAssessmentTotal).sum();
+            }
+
             for (MemberInfo memberInfo : memberInfoSelect) {
+                MemberAssessmentInfo memberAssessmentInf = new MemberAssessmentInfo();
+                memberAssessmentInf.setFullScore(fullScore);
                 //定义当前分数
                 nowScore = 0L;
-                //满分
-                fullScore = 0L;
                 Long userId = memberInfo.getUserId();
-                MemberAssessmentInfo memberAssessmentInf = new MemberAssessmentInfo();
                 memberAssessmentInf.setUserId(userId);
                 memberAssessmentInf.setYear(year);
                 memberAssessmentInf.setTotalPeople(memberInfoSelect.size());
-                memberAssessmentInf.setProposalScore(0L);
-                memberAssessmentInf.setSqmyScore(0L);
-                memberAssessmentInf.setConferenceScore(0L);
-                memberAssessmentInf.setActivityScore(0L);
-                memberAssessmentInf.setBonusScore(0L);
-                memberAssessmentInf.setTotalScore(0L);
+                memberAssessmentInf.setProposalScore(nowScore);
+                memberAssessmentInf.setSqmyScore(nowScore);
+                memberAssessmentInf.setConferenceScore(nowScore);
+                memberAssessmentInf.setActivityScore(nowScore);
+                memberAssessmentInf.setBonusScore(nowScore);
+                memberAssessmentInf.setTotalScore(nowScore);
+                memberAssessmentInf.setActivityScdyScore(nowScore);
+                memberAssessmentInf.setActivityLlzScore(nowScore);
+                memberAssessmentInf.setActivityJbScore(nowScore);
+                memberAssessmentInf.setActivityBssScore(nowScore);
+                memberAssessmentInf.setInvestmentScore(nowScore);
                 //查询提案情况
                 ProposalInfo proposalInfo = new ProposalInfo();
                 proposalInfo.setProposalUserId(userId);
@@ -134,6 +144,7 @@ public class TaskService extends Thread {
                 List<ZxInvestment> zxInvestments = zxInvestmentMapper.selectZxInvestmentList(zxInvestment);
                 //计算得分 勿删
                 if (zxAssessments != null && zxAssessments.size() > 0) {
+                    memberAssessmentInf.setFullScore(fullScore);
                     //计算提案得分
                     if (proposalInfos != null && proposalInfos.size() > 0) {
                         //获取分值上限
@@ -201,8 +212,6 @@ public class TaskService extends Thread {
                         }
 
                         memberAssessmentInf.setProposalScore(nowScore);
-                        //计算满分上限
-                        fullScore = fullScore + assessmentTotal;
                     }
                     //计算社情民义的分值
                     if (sqmyInfos != null && sqmyInfos.size() > 0) {
@@ -237,8 +246,6 @@ public class TaskService extends Thread {
                         }
 
                         memberAssessmentInf.setSqmyScore(nowScore);
-                        //计算满分上限
-                        fullScore = fullScore + assessmentTotal;
                     }
                     //计算会议分值
                     if (zxConferences != null && zxConferences.size() > 0) {
@@ -248,7 +255,7 @@ 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) {
                             for (ZxConference conference : collect) {
@@ -290,8 +297,6 @@ public class TaskService extends Thread {
                             nowScore = 0;
                         }
                         memberAssessmentInf.setConferenceScore(nowScore);
-                        //计算满分上限
-                        fullScore = fullScore + assessmentTotal;
                     }
                     //计算活动分值
                     if (zxActivities != null && zxActivities.size() > 0) {
@@ -338,16 +343,16 @@ public class TaskService extends Thread {
                                 String assessmentTypeId = zxAssessment.getAssessmentTypeId();
                                 //获取参与数量
                                 proposalCount = zxActivities.stream().filter(e -> e.getActivityType().equals(assessmentTypeId)).count();
-                                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 (FOR.equals(assessmentTypeId)) {
-                                    memberAssessmentInf.setActivityBssScore(assessmentScore1);
-                                }
-                                if (proposalCount > 0) {
+                                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 (FOR.equals(assessmentTypeId)) {
+                                        memberAssessmentInf.setActivityBssScore(assessmentScore1);
+                                    }
                                     nowScore = nowScore + assessmentScore1;
                                 }
                             }
@@ -355,8 +360,6 @@ public class TaskService extends Thread {
                                 nowScore = assessmentTotal;
                             }
                             memberAssessmentInf.setActivityScore(nowScore);
-                            //计算满分上限
-                            fullScore = fullScore + assessmentTotal;
                         }
                     }
                     //计算招商分数
@@ -391,8 +394,6 @@ public class TaskService extends Thread {
                             nowScore = assessmentTotal;
                         }
                         memberAssessmentInf.setInvestmentScore(nowScore);
-                        //计算满分上限
-                        fullScore = fullScore + assessmentTotal;
                     }
                     //计算加分
                     ZxBonus zxBonus = new ZxBonus();
@@ -408,7 +409,6 @@ public class TaskService extends Thread {
                             memberAssessmentInf.setBonusScore(assessmentTotal);
                         }
                     }
-                    memberAssessmentInf.setFullScore(fullScore);
                 }
 
                 //总分 = 提案得分+社情民意得分+会议得分+活动得分+加分