修改成绩相关

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

@@ -70,7 +70,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         Map<String, Object> map = new HashMap<>(8);
 
         //将参数放入容器中
-        map.put("pageNo", (pageNum-1)*pageSize);
+        map.put("pageNo", (pageNum - 1) * pageSize);
         map.put("pageSize", pageSize);
         map.put("startTime", queryVo.getStartTime());
         map.put("endTime", queryVo.getEndTime());
@@ -91,44 +91,44 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
                 userInfoDto.setCultureGrade(scoreInfo.getCultureGrade().toString());
                 userInfoDto.setMajorGrade(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());
-
-                if (null != userLimit) {
-                    userInfoDto.setQueryLimit(userLimit.getUsableLimit());
-                }
-                List<PayRecord> byId = payRecordMapper.getById(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 (!CollectionUtils.isEmpty(byId)) {
-                    //计算累计充值金额
-                    Integer sumMoney = 0;
-                    for (PayRecord payRecord : byId) {
-                        sumMoney += payRecord.getMoney();
-                    }
+            if (null != userLimit) {
+                userInfoDto.setQueryLimit(userLimit.getUsableLimit());
+            }
+            List<PayRecord> byId = payRecordMapper.getById(user.getId());
 
-                    userInfoDto.setMoneyAmount(sumMoney.toString());
+            if (!CollectionUtils.isEmpty(byId)) {
+                //计算累计充值金额
+                Integer sumMoney = 0;
+                for (PayRecord payRecord : byId) {
+                    sumMoney += payRecord.getMoney();
                 }
 
-                //将消息进行同步
-                BeanUtils.copyProperties(user, userInfoDto);
-                userInfoDto.setUserId(user.getId());
-                userInfoDto.setRegisterTime(user.getCreateTime());
-                list.add(userInfoDto);
+                userInfoDto.setMoneyAmount(sumMoney.toString());
             }
 
-            PageInfo<UserInfoDto> info = new PageInfo<>();
-            info.setPageSize(pageSize);
-            info.setPageNum(pageNum);
-            info.setTotal(usersMapper.getUserNumbers(map));
-            info.setList(list);
-
-            return R.ok(info);
+            //将消息进行同步
+            BeanUtils.copyProperties(user, userInfoDto);
+            userInfoDto.setUserId(user.getId());
+            userInfoDto.setRegisterTime(user.getCreateTime());
+            list.add(userInfoDto);
         }
 
+        PageInfo<UserInfoDto> info = new PageInfo<>();
+        info.setPageSize(pageSize);
+        info.setPageNum(pageNum);
+        info.setTotal(usersMapper.getUserNumbers(map));
+        info.setList(list);
+
+        return R.ok(info);
+    }
+
 
     @Override
     public R<UserInfoVo> commitUserInfo(UserCommitDto userInfo) {
@@ -143,6 +143,12 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             return R.error("用户信息不存在!");
         }
 
+        //检查成绩信息
+        R<Boolean> booleanR = volunteerManager.checkScore(userInfo.getScoreInfo());
+        if (null != booleanR && booleanR.getCode() == 1) {
+            return R.error(booleanR.getMessage());
+        }
+
         //2、要提交的用户信息
         user.setSchool(userInfo.getSchool());
         user.setSex(userInfo.getSex());
@@ -189,6 +195,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         user.setExamType(userDto.getStudentType());
         user.setUserName(userDto.getUserName());
 
+        //检查成绩信息
+        R<Boolean> booleanR = volunteerManager.checkScore(userDto.getScoreInfo());
+        if (null != booleanR && booleanR.getCode() == 1) {
+            return R.error(booleanR.getMessage());
+        }
 
         //3、要提交的用户的成绩信息
         ScoreInfo scoreInfo = scoreInfoMapper.getById(userDto.getUserId());
@@ -248,11 +259,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);
     }
 
@@ -277,4 +288,5 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         orderQueryVo.setPageNo(pageNum);
         orderQueryVo.setPageSize(pageSize);
     }
+
 }

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

@@ -66,8 +66,16 @@ public class VolunteerManager {
     @Autowired
     private UserLimitService userLimitService;
 
+    /**
+     * 错误码
+     */
     private static final int ERROR_CODE = 1;
 
+    /**
+     * 副科是六选三科
+     */
+    private static final int CLASS_COUNT = 3;
+
     /**
      * 更新用户查询信息并保存扣减记录
      *
@@ -221,24 +229,7 @@ public class VolunteerManager {
         if (null == scoreInfo.getMajorGrade()) {
             scoreInfo.setMajorGrade(0.00);
         }
-        if (null == scoreInfo.getPoliticsGrade()) {
-            scoreInfo.setPoliticsGrade(0.00);
-        }
-        if (null == scoreInfo.getHistoryGrade()) {
-            scoreInfo.setHistoryGrade(0.00);
-        }
-        if (null == scoreInfo.getBiologyGrade()) {
-            scoreInfo.setBiologyGrade(0.00);
-        }
-        if (null == scoreInfo.getChemistryGrade()) {
-            scoreInfo.setChemistryGrade(0.00);
-        }
-        if (null == scoreInfo.getPhysicsGrade()) {
-            scoreInfo.setPhysicsGrade(0.00);
-        }
-        if (null == scoreInfo.getGeographyGrade()) {
-            scoreInfo.setGeographyGrade(0.00);
-        }
+
         int save = scoreInfoMapper.add(scoreInfo);
         if (save == 0) {
             return false;
@@ -321,4 +312,37 @@ public class VolunteerManager {
 
         return true;
     }
+
+    /**
+     * 检查成绩信息
+     *
+     * @param scoreInfo 成绩
+     * @return true or false
+     */
+    public R<Boolean> checkScore(ScoreInfo scoreInfo) {
+        int count = 0;
+        if (null != scoreInfo.getPoliticsGrade()) {
+            count = count + 1;
+        }
+        if (null != scoreInfo.getHistoryGrade()) {
+            count = count + 1;
+        }
+        if (null != scoreInfo.getBiologyGrade()) {
+            count = count + 1;
+        }
+        if (null != scoreInfo.getChemistryGrade()) {
+            count = count + 1;
+        }
+        if (null != scoreInfo.getPhysicsGrade()) {
+            count = count + 1;
+        }
+        if (null != scoreInfo.getGeographyGrade()) {
+            count = count + 1;
+        }
+
+        if (count > CLASS_COUNT) {
+            return R.error(1, "只能填三科副科成绩", false);
+        }
+        return R.ok(0, true);
+    }
 }