修改个人信息编辑4

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

@@ -22,7 +22,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 javax.servlet.http.HttpServletResponse;
@@ -56,6 +55,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);
@@ -170,8 +171,24 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         //3、要提交的用户的成绩信息
         ScoreInfo scoreInfo = userInfo.getScoreInfo();
 
+        //检查副科
+        R<Boolean> checkScore = volunteerManager.checkScore(scoreInfo);
+        if (null != checkScore && checkScore.getCode() == ERROR_CODE) {
+            return R.error(checkScore.getMessage());
+        }
+
+        ScoreInfo flagStatus = scoreInfoMapper.getByUserId(user.getId());
+        int flag;
+        if (null == flagStatus) {
+            //新增
+            flag = 1;
+        } else {
+            //编辑
+            flag = 2;
+        }
+
         //4、更新用户信息和保存用户成绩
-        boolean bool = volunteerManager.updateAndSaveUserInfo(user, scoreInfo,userInfo.getFlag());
+        boolean bool = volunteerManager.updateAndSaveUserInfo(user, scoreInfo,flag);
         if (!bool) {
             return R.error("添加用户信息失败!");
         }
@@ -208,6 +225,13 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
         //3、要提交的用户的成绩信息
         ScoreInfo scoreInfo = scoreInfoMapper.getByUserId(userDto.getUserId());
+
+        //检查副科
+        R<Boolean> checkScore = volunteerManager.checkScore(userDto.getScoreInfo());
+        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());