Skip to content

V
volunteer_service
Commit 9df4ce35 authored by licc's avatar licc
Browse files
Options

查询方案优化2

parent e027ff53
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 55 deletions
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
View file @ 9df4ce35
......@@ -246,17 +246,17 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
list = getVolunteerList(list, totalResult);
}
//6保存用户方案记录、志愿之间的关联关系,扣减查询次数
R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
if (null != bool && bool.getCode() == 500) {
return R.error("保存方案查询记录失败!");
}
// //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
// R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
// if (null != bool && bool.getCode() == 500) {
// return R.error("保存方案查询记录失败!");
// }
//排序
list.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
volunteerVo.setUserId(user.getId());
assert bool != null;
volunteerVo.setRecordId(bool.getData());
// assert bool != null;
// volunteerVo.setRecordId(bool.getData());
volunteerVo.setVolunteers(list);
volunteerVo.setTotal(list.size());
return R.ok(volunteerVo);
......@@ -724,6 +724,10 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
for (int i = 0; i < number; i++) {
Random mRandom = new Random();
int count = mRandom.nextInt(otherList.size());
if (result.contains(otherList.get(count))) {
otherList.remove(number);
continue;
}
volunteers.add(otherList.get(count));
otherList.remove(number);
}
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @ 9df4ce35
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;
......@@ -71,7 +69,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());
......@@ -92,61 +90,61 @@ 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());
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());
if (!CollectionUtils.isEmpty(byId)) {
//计算充值卡充值次数
Integer rechargeTimes = 0;
if (!CollectionUtils.isEmpty(byId)) {
//计算充值卡充值次数
Integer rechargeTimes = 0;
//支付宝充值总金额
Integer alipayMoney=0;
//支付宝充值总金额
Integer alipayMoney = 0;
//微信充值总金额
Integer weChatMoney=0;
for (PayRecord payRecord : byId) {
if (payRecord.getType()==1) {
alipayMoney+=Integer.valueOf(payRecord.getMoney());
}
//微信充值总金额
Integer weChatMoney = 0;
for (PayRecord payRecord : byId) {
if (payRecord.getType() == 1) {
alipayMoney += Integer.valueOf(payRecord.getMoney());
}
if (payRecord.getType()==2) {
weChatMoney+=Integer.valueOf(payRecord.getMoney());
}
if (payRecord.getType() == 2) {
weChatMoney += Integer.valueOf(payRecord.getMoney());
}
if (payRecord.getType()==3) {
rechargeTimes+=1;
}
if (payRecord.getType() == 3) {
rechargeTimes += 1;
}
userInfoDto.setWeChatMoney(String.valueOf(weChatMoney));
userInfoDto.setAlipayMoney(String.valueOf(alipayMoney));
userInfoDto.setRechargeTimes(rechargeTimes);
}
//将消息进行同步
BeanUtils.copyProperties(user, userInfoDto);
userInfoDto.setUserId(user.getId());
userInfoDto.setRegisterTime(user.getCreateTime());
list.add(userInfoDto);
userInfoDto.setWeChatMoney(String.valueOf(weChatMoney));
userInfoDto.setAlipayMoney(String.valueOf(alipayMoney));
userInfoDto.setRechargeTimes(rechargeTimes);
}
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) {
......@@ -172,6 +170,12 @@ 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) {
......@@ -207,6 +211,11 @@ 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());
......@@ -266,11 +275,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-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/VolunteerController.java
View file @ 9df4ce35
......@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
* @ Description: PC-志愿模块
* @ Author : 86187
* @ Date : 2021/1/14 10:55
* @author 86187
*/
@RestController
@Api(tags = "PC-志愿模块")
......
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