修改个人信息编辑

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ScoreInfoMapper.java

@@ -4,6 +4,9 @@ import cn.wisenergy.model.app.ScoreInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+/**
+ * @author 86187
+ */
 public interface ScoreInfoMapper extends BaseMapper<ScoreInfo> {
     /**
      * 添加考生成绩
@@ -29,5 +32,5 @@ public interface ScoreInfoMapper extends BaseMapper<ScoreInfo> {
      */
     int delById(@Param("id") Integer id);
 
-    ScoreInfo getById(@Param("userId") Integer userId);
+    ScoreInfo getByUserId(@Param("userId") Integer userId);
 }

wisenergy-mapper/src/main/resources/mapper/ScoreInfoMapper.xml

@@ -115,7 +115,7 @@
         where id = #{id}
     </delete>
 
-    <select id="getById" resultMap="userMap">
+    <select id="getByUserId" resultMap="userMap">
         select
         <include refid="cols_all"/>
         from

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

 package cn.wisenergy.service.app.impl;
 
-import cn.hutool.system.UserInfo;
 import cn.wisenergy.common.constant.CommonAttributes;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.*;
@@ -19,7 +18,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -28,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * @author 86187
  * @ Description: 用户接口实现
  * @ Author     : 86187
  * @ Date       : 2021/1/6 16:11
@@ -54,6 +53,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
     @Autowired
     protected VolunteerManager volunteerManager;
 
+    private static final int ERROR_CODE = 1;
+
     @Override
     public R<PageInfo<UserInfoDto>> getUserList(UserQueryVo queryVo) {
         log.info("volunteer_service[]UserServiceImpl[]getUserList[]input.param.queryVo:" + queryVo);
@@ -78,22 +79,22 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             UserInfoDto userInfoDto = new UserInfoDto();
 
             //查询相关信息
-            ScoreInfo scoreInfo = scoreInfoMapper.getById(user.getId());
+            ScoreInfo scoreInfo = scoreInfoMapper.getByUserId(user.getId());
             if (null != scoreInfo) {
                 userInfoDto.setCultureGrade(scoreInfo.getCultureGrade().toString());
-                userInfoDto.setMajorGrade(null==scoreInfo.getMajorGrade()?"":scoreInfo.getMajorGrade().toString());
+                userInfoDto.setMajorGrade(null == scoreInfo.getMajorGrade() ? "" : scoreInfo.getMajorGrade().toString());
             }
-                LoginRecord loginRecord = loginRecordMapper.getById(user.getId());
-                if (null != loginRecord) {
-                    userInfoDto.setLastLoginTime(loginRecord.getUpdateTime());
-                    userInfoDto.setIp(loginRecord.getIp());
-                }
-                UserLimit userLimit = userLimitMapper.getByUserId(user.getId());
+            LoginRecord loginRecord = loginRecordMapper.getById(user.getId());
+            if (null != loginRecord) {
+                userInfoDto.setLastLoginTime(loginRecord.getUpdateTime());
+                userInfoDto.setIp(loginRecord.getIp());
+            }
+            UserLimit userLimit = userLimitMapper.getByUserId(user.getId());
 
-                if (null != userLimit) {
-                    userInfoDto.setQueryLimit(userLimit.getUsableLimit());
-                }
-                List<PayRecord> byId = payRecordMapper.getById(user.getId());
+            if (null != userLimit) {
+                userInfoDto.setQueryLimit(userLimit.getUsableLimit());
+            }
+            List<PayRecord> byId = payRecordMapper.getById(user.getId());
 
             //计算充值卡充值次数
             Integer rechargeTimes = 0;
@@ -124,21 +125,21 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             userInfoDto.setAlipayMoney(String.valueOf(alipayMoney));
             userInfoDto.setRechargeTimes(rechargeTimes);
 
-                //将消息进行同步
-                BeanUtils.copyProperties(user, userInfoDto);
-                userInfoDto.setUserId(user.getId());
-                userInfoDto.setRegisterTime(user.getCreateTime());
-                list.add(userInfoDto);
-            }
+            //将消息进行同步
+            BeanUtils.copyProperties(user, userInfoDto);
+            userInfoDto.setUserId(user.getId());
+            userInfoDto.setRegisterTime(user.getCreateTime());
+            list.add(userInfoDto);
+        }
 
-            PageInfo<UserInfoDto> info = new PageInfo<>();
-            info.setPageSize(queryVo.getPageSize());
-            info.setPageNum(queryVo.getPageNo());
-            info.setTotal(usersMapper.getUserNumbers(map));
-            info.setList(list);
+        PageInfo<UserInfoDto> info = new PageInfo<>();
+        info.setPageSize(queryVo.getPageSize());
+        info.setPageNum(queryVo.getPageNo());
+        info.setTotal(usersMapper.getUserNumbers(map));
+        info.setList(list);
 
-            return R.ok(info);
-        }
+        return R.ok(info);
+    }
 
 
     @Override
@@ -163,10 +164,27 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         user.setSource(userInfo.getSource());
 
         //3、要提交的用户的成绩信息
+        ScoreInfo score = scoreInfoMapper.getByUserId(user.getId());
+
+        //检查副科
+        R<Boolean> checkScore = volunteerManager.checkScore(score);
+        if (null != checkScore && checkScore.getCode() == ERROR_CODE) {
+            return R.error(checkScore.getMessage());
+        }
+
         ScoreInfo scoreInfo = userInfo.getScoreInfo();
+        ScoreInfo flagStatus = scoreInfoMapper.getByUserId(user.getId());
+        int flag;
+        if (null == flagStatus) {
+            //新增
+            flag = 1;
+        } else {
+            //编辑
+            flag = 2;
+        }
 
         //4、更新用户信息和保存用户成绩
-        boolean bool = volunteerManager.updateAndSaveUserInfo(user, scoreInfo);
+        boolean bool = volunteerManager.updateAndSaveUserInfo(user, scoreInfo,flag);
         if (!bool) {
             return R.error("添加用户信息失败!");
         }
@@ -202,7 +220,14 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
 
         //3、要提交的用户的成绩信息
-        ScoreInfo scoreInfo = scoreInfoMapper.getById(userDto.getUserId());
+        ScoreInfo scoreInfo = scoreInfoMapper.getByUserId(userDto.getUserId());
+
+        //检查副科
+        R<Boolean> checkScore = volunteerManager.checkScore(scoreInfo);
+        if (null != checkScore && checkScore.getCode() == ERROR_CODE) {
+            return R.error(checkScore.getMessage());
+        }
+
         scoreInfo.setUserId(userDto.getUserId());
         scoreInfo.setBiologyGrade(userDto.getScoreInfo().getBiologyGrade());
         scoreInfo.setChemistryGrade(userDto.getScoreInfo().getChemistryGrade());
@@ -264,11 +289,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
     @Override
     public R<List<User>> test() {
-        List<String> names=new ArrayList<>();
+        List<String> names = new ArrayList<>();
         names.add("黎楚川");
         names.add("陈成");
         names.add("雷青松");
-        List<User> list=usersMapper.test(names);
+        List<User> list = usersMapper.test(names);
         return R.ok(list);
     }
 

wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java

@@ -227,7 +227,7 @@ public class VolunteerManager {
      * @return true or false
      */
     @Transactional(rollbackFor = Exception.class)
-    public boolean updateAndSaveUserInfo(User user, ScoreInfo scoreInfo) {
+    public boolean updateAndSaveUserInfo(User user, ScoreInfo scoreInfo, Integer flag) {
         //1、更新用户信息
         int count = usersMapper.edit(user);
         if (count == 0) {
@@ -239,11 +239,21 @@ public class VolunteerManager {
             scoreInfo.setMajorGrade(0.00);
         }
 
-        int save = scoreInfoMapper.add(scoreInfo);
-        if (save == 0) {
-            return false;
+        //flag =1  添加
+        if (null != flag && flag == 1) {
+            int save = scoreInfoMapper.add(scoreInfo);
+            if (save == 0) {
+                return false;
+            }
         }
 
+        //flag =2  编辑
+        if (null != flag && flag == 2) {
+            int edit = scoreInfoMapper.edit(scoreInfo);
+            if (edit == 0) {
+                return false;
+            }
+        }
         return true;
     }