Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -23,6 +23,8 @@ import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysUserService;
 
+import static com.ruoyi.common.constant.CommonConstants.ONE;
+
 /**
  * 个人信息 业务处理
  * 
@@ -92,6 +94,11 @@ public class SysProfileController extends BaseController
         LoginUser loginUser = getLoginUser();
         String userName = loginUser.getUsername();
         String password = loginUser.getPassword();
+        SysUser sysUser = new SysUser();
+        sysUser.setPassword(newPassword);
+        if (ONE.equals(userService.checkStrongPwd(sysUser))) {
+            return AjaxResult.error("密码必须包含数字、大小写字母、特殊符号且大于8位");
+        }
         if (!SecurityUtils.matchesPassword(oldPassword, password))
         {
             return error("修改密码失败，旧密码错误");

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -135,7 +135,7 @@ public class SysUserController extends BaseController
             return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
         else if (ONE.equals(userService.checkStrongPwd(user))) {
-        return AjaxResult.error("密码必须包含数字、大小写字母、特殊符号且大于8位");
+            return AjaxResult.error("密码必须包含数字、大小写字母、特殊符号且大于8位");
         }
         user.setCreateBy(getUsername());
         user.setPlaintext(user.getPassword());

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

@@ -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);
@@ -119,28 +129,29 @@ public class TaskService extends Thread {
                 List<SqmyInfo> sqmyInfos = sqmyInfoMapper.selectSqmyInfoList(sqmyInfo);
                 //查询政协会议
                 ZxConference zxConference = new ZxConference();
-                zxConference.setUserId(SecurityUtils.getUserId());
+                zxConference.setUserId(userId);
                 zxConference.setYear(year);
                 List<ZxConference> zxConferences = zxConferenceMapper.selectZxConferenceList(zxConference);
                 //查询活动
                 ZxActivity zxActivity = new ZxActivity();
-                zxActivity.setUserId(SecurityUtils.getUserId());
+                zxActivity.setUserId(userId);
                 zxActivity.setYear(year);
                 List<ZxActivity> zxActivities = zxActivityMapper.selectZxActivityList(zxActivity);
                 //招商
                 ZxInvestment zxInvestment = new ZxInvestment();
-                zxInvestment.setUserId(SecurityUtils.getUserId());
+                zxInvestment.setUserId(userId);
                 zxInvestment.setYear(year);
                 List<ZxInvestment> zxInvestments = zxInvestmentMapper.selectZxInvestmentList(zxInvestment);
                 //计算得分 勿删
                 if (zxAssessments != null && zxAssessments.size() > 0) {
+                    memberAssessmentInf.setFullScore(fullScore);
                     //计算提案得分
                     if (proposalInfos != null && proposalInfos.size() > 0) {
                         //获取分值上限
                         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())
@@ -151,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())
@@ -163,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())
@@ -175,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())
@@ -187,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())
@@ -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,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) {
@@ -269,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) {
@@ -285,25 +297,26 @@ public class TaskService extends Thread {
                             }
                         }
                         //判断分是否扣完
-                        nowScore = assessmentTotal + nowScore;
+                        nowScore = assessmentTotal - nowScore;
                         if (nowScore < 0) {
                             nowScore = 0;
                         }
+                        if (nowScore > assessmentTotal) {
+                            nowScore = assessmentTotal;
+                        }
                         memberAssessmentInf.setConferenceScore(nowScore);
-                        //计算满分上限
-                        fullScore = fullScore + assessmentTotal;
                     }
                     //计算活动分值
                     if (zxActivities != null && zxActivities.size() > 0) {
                         //定义当前分数
-                        nowScore = 0L;
+/*                        nowScore = 0L;
                         //先去查询是否有学习培训活动未参加
                         List<ZxActivity> collect = zxActivities.stream().filter(e -> e.getActivityType().equals(ONE)).collect(Collectors.toList());
                         if (collect.size() > 0) {
                             for (ZxActivity activity : collect) {
                                 List<ZxActivityUser> zxActivityUserList = activity.getZxActivityUserList();
                                 if (zxActivityUserList != null && zxActivityUserList.size() > 0) {
-                                    //获取到不参加会议的数量
+                                    //获取到不参加活动的数量
                                     proposalCount = proposalCount + zxActivityUserList.stream().filter(e -> "N".equals(e.getIsJoin()) && THR.equals(e.getApproval())).count();
                                 }
                             }
@@ -314,16 +327,16 @@ public class TaskService extends Thread {
                                 //计算当前分数
                                 nowScore = nowScore + proposalCount * assessmentScore;
                             }
-                            Object sqmyInfoScore = memberAssessmentInf.getSqmyScore();
-                            if (Integer.parseInt(sqmyInfoScore.toString()) > 0) {
+                            Long conferenceScore = memberAssessmentInf.getConferenceScore();
+                            if (conferenceScore > 0) {
                                 //判断分是否扣完
-                                nowScore = assessmentTotal + nowScore;
+                                nowScore = conferenceScore - nowScore;
                                 if (nowScore < 0) {
                                     nowScore = 0;
                                 }
-                                memberAssessmentInf.setSqmyScore(nowScore);
+                                memberAssessmentInf.setConferenceScore(nowScore);
                             }
-                        }
+                        }*/
                         nowScore = 0L;
                         //获取分值上限
                         assessmentTotal = zxAssessments.stream().filter(e -> "assessment_activity".equals(e.getAssessmentProjectId()) && 0 == e.getParentId()).collect(Collectors.toList())
@@ -338,16 +351,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 (ONE.equals(assessmentTypeId)) {
+                                        memberAssessmentInf.setActivityScdyScore(assessmentScore1);
+                                    } else if (TWO.equals(assessmentTypeId)) {
+                                        memberAssessmentInf.setActivityJbScore(assessmentScore1);
+                                    } else if (THR.equals(assessmentTypeId)) {
+                                        memberAssessmentInf.setActivityLlzScore(assessmentScore1);
+                                    } else if (FOR.equals(assessmentTypeId)) {
+                                        memberAssessmentInf.setActivityBssScore(assessmentScore1);
+                                    }
                                     nowScore = nowScore + assessmentScore1;
                                 }
                             }
@@ -355,8 +368,6 @@ public class TaskService extends Thread {
                                 nowScore = assessmentTotal;
                             }
                             memberAssessmentInf.setActivityScore(nowScore);
-                            //计算满分上限
-                            fullScore = fullScore + assessmentTotal;
                         }
                     }
                     //计算招商分数
@@ -367,7 +378,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())
@@ -378,7 +389,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())
@@ -391,8 +402,7 @@ public class TaskService extends Thread {
                             nowScore = assessmentTotal;
                         }
                         memberAssessmentInf.setInvestmentScore(nowScore);
-                        //计算满分上限
-                        fullScore = fullScore + assessmentTotal;
+                        memberAssessmentInf.setBonusScore(nowScore);
                     }
                     //计算加分
                     ZxBonus zxBonus = new ZxBonus();
@@ -408,10 +418,9 @@ public class TaskService extends Thread {
                             memberAssessmentInf.setBonusScore(assessmentTotal);
                         }
                     }
-                    memberAssessmentInf.setFullScore(fullScore);
                 }
 
-                //总分 = 提案得分+社情民意得分+会议得分+活动得分+加分
+                //总分 = 提案得分+社情民意得分+会议得分+活动得分+加分(招商引资算加分)
                 long totalScore = memberAssessmentInf.getProposalScore() + memberAssessmentInf.getSqmyScore() + memberAssessmentInf.getConferenceScore() + memberAssessmentInf.getActivityScore() + memberAssessmentInf.getBonusScore();
                 //判断总分是否大于满分
                 if (totalScore > memberAssessmentInf.getFullScore()) {
@@ -421,40 +430,45 @@ public class TaskService extends Thread {
                 memberAssessmentInfoListNew.add(memberAssessmentInf);
             }
             List<MemberAssessmentInfo> collect = memberAssessmentInfoListNew.stream().sorted(Comparator.comparing(MemberAssessmentInfo::getTotalScore).reversed()).collect(Collectors.toList());
+            //计算排名
+            int index = 0;
+            //最近的一次分数
+            Long lastScore = -1L;
+            //执行任务
+            for (int i = 0; i < collect.size(); i++) {
+                MemberAssessmentInfo memberAssessmentInfoNew = collect.get(i);
+                Long totalScore = memberAssessmentInfoNew.getTotalScore();
+                if (!lastScore.equals(totalScore)) {
+                    lastScore = totalScore;
+                    index++;
+                }
+                memberAssessmentInfoNew.setRank(String.valueOf(index));
+            }
             //开启多线程处理
             //获取线程池中的@bean
             ThreadPoolTaskExecutor executor = SpringUtils.getBean("threadPoolTaskExecutor");
             //定义每个线程处理多少用户
-            Integer count = 50;
+            int count = 50;
             //根据用户数确定需要多少个线程
             List<List<MemberAssessmentInfo>> lists = BranchThreadUtils.splitList(collect, count);
             for (List<MemberAssessmentInfo> list : lists) {
                 executor.execute(() -> {
                     System.out.println("线程" + Thread.currentThread().getId() + "启动");
-                    //计算排名
-                    int index = 0;
-                    //最近的一次分数
-                    Long lastScore = 0L;
-                    //执行任务
-                    for (int i = 0; i < list.size(); i++) {
-                        MemberAssessmentInfo memberAssessmentInfoNew = list.get(i);
-                        Long totalScore = memberAssessmentInfoNew.getTotalScore();
-                        if (!lastScore.equals(totalScore)) {
-                            lastScore = totalScore;
-                            index++;
-                        }
-                        memberAssessmentInfoNew.setRank(String.valueOf(index));
+                    for (MemberAssessmentInfo assessmentInfo : list) {
                         //判断是更新还是新增
                         if (memberAssessmentInfoList != null && memberAssessmentInfoList.size() > 0) {
                             //更新
-                            memberAssessmentInfoMapper.updateMemberAssessmentInfo(memberAssessmentInfoNew);
+                            int i = memberAssessmentInfoMapper.updateMemberAssessmentInfo(assessmentInfo);
+                            if (i == 0){
+                                memberAssessmentInfoMapper.insertMemberAssessmentInfo(assessmentInfo);
+                            }
                         } else {
-                            memberAssessmentInfoMapper.insertMemberAssessmentInfo(memberAssessmentInfoNew);
+                            memberAssessmentInfoMapper.insertMemberAssessmentInfo(assessmentInfo);
                         }
                         MemberInfo memberInfo = new MemberInfo();
-                        memberInfo.setUserId(memberAssessmentInfoNew.getUserId());
-                        memberInfo.setScore(memberAssessmentInfoNew.getTotalScore());
-                        memberInfo.setRanking(memberAssessmentInfoNew.getRank());
+                        memberInfo.setUserId(assessmentInfo.getUserId());
+                        memberInfo.setScore(assessmentInfo.getTotalScore());
+                        memberInfo.setRanking(assessmentInfo.getRank());
                         //更新委员主表
                         memberInfoMapper.updateMemberInfoByUserId(memberInfo);
                     }

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

@@ -223,6 +223,8 @@ public class ZxActivityServiceImpl implements IZxActivityService {
             List<String> userNameList = new ArrayList<>();
             for (ZxActivityUser zxActivityUser : zxActivityUserList) {
                 zxActivityUser.setActivityId(activityId);
+                zxActivityUser.setIsJoin("Y");
+                zxActivityUser.setReplyTime(DateUtils.getNowDate());
                 list.add(zxActivityUser);
 
                 String userName = zxActivityUser.getUserName();

ruoyi-system/src/main/resources/mapper/system/MemberAssessmentInfoMapper.xml

@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="activityLlzScore != null">activity_llz_score,</if>
             <if test="activityJbScore != null">activity_jb_score,</if>
             <if test="activityBssScore != null">activity_bss_score,</if>
-            <if test="investmentScore != null">investmentScore,</if>
+            <if test="investmentScore != null">investment_score,</if>
             <if test="totalPeople != null">total_people,</if>
             <if test="rank != null">rank,</if>
             <if test="year != null">year_data,</if>

ruoyi-system/src/main/resources/mapper/system/MemberInfoMapper.xml

@@ -136,13 +136,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where member_id = #{memberId}
     </update>
 
-    <update id="updateMemberInfoByUserId" parameterType="MemberInfo">
-        update member_info
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="score != null and score != ''">score = #{score},</if>
-            <if test="ranking != null and ranking != ''">ranking = #{ranking},</if>
-        </trim>
-        where user_id = #{userId}
+    <update id="updateMemberInfoByUserId">
+        update member_info set score = #{score},ranking = #{ranking} where user_id = #{userId}
     </update>
 
     <delete id="deleteMemberInfoByMemberId" parameterType="Long">