Commit 9ca80450 authored by liaoanyuan's avatar liaoanyuan

用户查询专业成绩为空问题修改

parent 94ac906c
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.*;
......@@ -18,6 +19,7 @@ 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;
......@@ -56,21 +58,12 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
public R<PageInfo<UserInfoDto>> getUserList(UserQueryVo queryVo) {
log.info("volunteer_service[]UserServiceImpl[]getUserList[]input.param.queryVo:" + queryVo);
Integer pageNum = queryVo.getPageNo();
Integer pageSize = queryVo.getPageSize();
if (null == pageSize || pageSize == 0) {
pageSize = 10;
}
if (null == pageNum || pageNum == 0) {
pageNum = 1;
}
//创建参数容器
Map<String, Object> map = new HashMap<>(8);
Map<String, Object> map = new HashMap<>(4);
//将参数放入容器中
map.put("pageNo", (pageNum - 1) * pageSize);
map.put("pageSize", pageSize);
map.put("pageNo", (queryVo.getPageNo() - 1) * queryVo.getPageSize());
map.put("pageSize", queryVo.getPageSize());
map.put("startTime", queryVo.getStartTime());
map.put("endTime", queryVo.getEndTime());
map.put("userName", queryVo.getUserName());
......@@ -88,7 +81,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
ScoreInfo scoreInfo = scoreInfoMapper.getById(user.getId());
if (null != scoreInfo) {
userInfoDto.setCultureGrade(scoreInfo.getCultureGrade().toString());
userInfoDto.setMajorGrade(scoreInfo.getMajorGrade().toString());
userInfoDto.setMajorGrade(null==scoreInfo.getMajorGrade()?"":scoreInfo.getMajorGrade().toString());
}
LoginRecord loginRecord = loginRecordMapper.getById(user.getId());
if (null != loginRecord) {
......@@ -103,30 +96,13 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
List<PayRecord> byId = payRecordMapper.getById(user.getId());
if (!CollectionUtils.isEmpty(byId)) {
//计算充值卡充值次数
Integer rechargeTimes = 0;
//支付宝充值总金额
Integer alipayMoney = 0;
//微信充值总金额
Integer weChatMoney = 0;
//计算累计充值金额
Integer sumMoney = 0;
for (PayRecord payRecord : byId) {
if (payRecord.getType() == 1) {
alipayMoney += Integer.valueOf(payRecord.getMoney());
sumMoney += payRecord.getMoney();
}
if (payRecord.getType() == 2) {
weChatMoney += Integer.valueOf(payRecord.getMoney());
}
if (payRecord.getType() == 3) {
rechargeTimes += 1;
}
}
userInfoDto.setWeChatMoney(String.valueOf(weChatMoney));
userInfoDto.setAlipayMoney(String.valueOf(alipayMoney));
userInfoDto.setRechargeTimes(rechargeTimes);
userInfoDto.setMoneyAmount(sumMoney.toString());
}
//将消息进行同步
......@@ -137,8 +113,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
}
PageInfo<UserInfoDto> info = new PageInfo<>();
info.setPageSize(pageSize);
info.setPageNum(pageNum);
info.setPageSize(queryVo.getPageSize());
info.setPageNum(queryVo.getPageNo());
info.setTotal(usersMapper.getUserNumbers(map));
info.setList(list);
......@@ -170,12 +146,6 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
//3、要提交的用户的成绩信息
ScoreInfo scoreInfo = userInfo.getScoreInfo();
//检查成绩
R<Boolean> boolA = volunteerManager.checkScore(scoreInfo);
if (null != boolA && boolA.getCode() == 1) {
return R.error(boolA.getMessage());
}
//4、更新用户信息和保存用户成绩
boolean bool = volunteerManager.updateAndSaveUserInfo(user, scoreInfo);
if (!bool) {
......@@ -211,11 +181,6 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
user.setExamType(userDto.getStudentType());
user.setUserName(userDto.getUserName());
//检查成绩
R<Boolean> boolA = volunteerManager.checkScore(userDto.getScoreInfo());
if (null != boolA && boolA.getCode() == 1) {
return R.error(boolA.getMessage());
}
//3、要提交的用户的成绩信息
ScoreInfo scoreInfo = scoreInfoMapper.getById(userDto.getUserId());
......@@ -275,17 +240,16 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
@Override
public User getByPhone(String phone) {
User user=usersMapper.getByPhone(phone);
return user;
return null;
}
@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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment