新增总成绩字段,以及部分接口

master
xiaoCJ 2 years ago
parent b8ba01ee03
commit c60b6b13ea

@ -8,6 +8,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysGradeWeight; import com.ruoyi.system.domain.SysGradeWeight;
import com.ruoyi.system.domain.SysTrainingScore; import com.ruoyi.system.domain.SysTrainingScore;
import com.ruoyi.system.domain.SysTrainingScoreExample; import com.ruoyi.system.domain.SysTrainingScoreExample;
import com.ruoyi.system.domain.SysTrainingScoreWithBLOBs;
import com.ruoyi.system.domain.vo.ReportDto; import com.ruoyi.system.domain.vo.ReportDto;
import com.ruoyi.system.domain.vo.TrainingScoreVo; import com.ruoyi.system.domain.vo.TrainingScoreVo;
import com.ruoyi.system.domain.vo.TrainingTotalScoreVo; import com.ruoyi.system.domain.vo.TrainingTotalScoreVo;
@ -43,7 +44,7 @@ public class TrainingScoreController {
String controlsName = jsonObject.getString("controlsName"); String controlsName = jsonObject.getString("controlsName");
Long userId = jsonObject.getLong("userId"); Long userId = jsonObject.getLong("userId");
//检查状态是否提交且变更的值是否有数据 如果返回值为false 则执行更新操作 //检查状态是否提交且变更的值是否有数据 如果返回值为false 则执行更新操作
SysTrainingScore sysTrainingScore = trainingScoreService.checkStatusAndControlsName(userId, controlsName); SysTrainingScoreWithBLOBs sysTrainingScore = trainingScoreService.checkStatusAndControlsName(userId, controlsName);
if (sysTrainingScore != null) { if (sysTrainingScore != null) {
//更新userid的进度和分数 //更新userid的进度和分数
sysTrainingScore.calculateDataScore(); sysTrainingScore.calculateDataScore();
@ -85,12 +86,12 @@ public class TrainingScoreController {
//一键审批 //一键审批
@PostMapping("/approvalAll") @PostMapping("/approvalAll")
private String approvalAll() { private String approvalAll() {
List<SysTrainingScore> trainingScoreList = trainingScoreService.selectAllReportContent(); List<SysTrainingScoreWithBLOBs> trainingScoreList = trainingScoreService.selectAllReportContent();
if (trainingScoreList.isEmpty()) { if (trainingScoreList.isEmpty()) {
return "没有可审批的数据"; return "没有可审批的数据";
} }
for (int i = 0; i < trainingScoreList.size(); i++) { for (int i = 0; i < trainingScoreList.size(); i++) {
SysTrainingScore sysTrainingScore = trainingScoreList.get(i); SysTrainingScoreWithBLOBs sysTrainingScore = trainingScoreList.get(i);
if (sysTrainingScore.getReportContent() == null || "".equals(sysTrainingScore.getReportContent()) || sysTrainingScore.getTrainingReportScore() != null) { if (sysTrainingScore.getReportContent() == null || "".equals(sysTrainingScore.getReportContent()) || sysTrainingScore.getTrainingReportScore() != null) {
continue; continue;
} }
@ -107,7 +108,7 @@ public class TrainingScoreController {
} else { } else {
score = 100; // 超过350字直接满分 score = 100; // 超过350字直接满分
} }
SysTrainingScore trainingScore = new SysTrainingScore(); SysTrainingScoreWithBLOBs trainingScore = new SysTrainingScoreWithBLOBs();
trainingScore.setId(sysTrainingScore.getId()); trainingScore.setId(sysTrainingScore.getId());
trainingScore.setTrainingReportScore(score); trainingScore.setTrainingReportScore(score);
trainingScoreService.updateByPrimaryKeySelective(trainingScore); trainingScoreService.updateByPrimaryKeySelective(trainingScore);
@ -137,9 +138,9 @@ public class TrainingScoreController {
public String getSubmitAndSaveReport(@RequestParam Long userId) { public String getSubmitAndSaveReport(@RequestParam Long userId) {
SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample();
trainingScoreExample.createCriteria().andUseridEqualTo(userId); trainingScoreExample.createCriteria().andUseridEqualTo(userId);
List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample); List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
if (!sysTrainingScores.isEmpty()) { if (!sysTrainingScores.isEmpty()) {
SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0);
return sysTrainingScore.getReportContent(); return sysTrainingScore.getReportContent();
} }
return null; return null;

@ -1,29 +1,30 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.alibaba.fastjson2.JSONObject;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain.SysTrainingScore; import com.ruoyi.system.domain.SysTrainingScore;
import com.ruoyi.system.domain.SysTrainingScoreWithBLOBs;
import com.ruoyi.system.domain.vo.ReportDto; import com.ruoyi.system.domain.vo.ReportDto;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.Map;
public interface ISysTrainingScoreService { public interface ISysTrainingScoreService {
SysTrainingScore checkStatusAndControlsName(Long userId, String controlsName); SysTrainingScoreWithBLOBs checkStatusAndControlsName(Long userId, String controlsName);
AjaxResult uploadReport(MultipartFile file, String fileName, Long id); AjaxResult uploadReport(MultipartFile file, String fileName, Long id);
AjaxResult saveOrSubmitReport(String content, Long userId, boolean isSubmit); AjaxResult saveOrSubmitReport(String content, Long userId, boolean isSubmit);
void updateByPrimaryKeySelective(SysTrainingScore sysTrainingScore); void updateByPrimaryKeySelective(SysTrainingScoreWithBLOBs sysTrainingScore);
SysTrainingScore selectByUserId(Long userId); SysTrainingScore selectByUserId(Long userId);
List<SysTrainingScore> selectAllReportContent(); List<SysTrainingScoreWithBLOBs> selectAllReportContent();
PageInfo<ReportDto> teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass); PageInfo<ReportDto> teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass);

@ -1,16 +1,14 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.TrainingScoreConstants; import com.ruoyi.common.constant.TrainingScoreConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysGradeWeight; import com.ruoyi.system.domain.SysGradeWeight;
import com.ruoyi.system.domain.SysTrainingScore; import com.ruoyi.system.domain.SysTrainingScore;
import com.ruoyi.system.domain.SysTrainingScoreExample; import com.ruoyi.system.domain.SysTrainingScoreExample;
import com.ruoyi.system.domain.SysTrainingScoreWithBLOBs;
import com.ruoyi.system.domain.vo.ReportDto; import com.ruoyi.system.domain.vo.ReportDto;
import com.ruoyi.system.mapper.SysGradeWeightMapper; import com.ruoyi.system.mapper.SysGradeWeightMapper;
import com.ruoyi.system.mapper.SysTrainingScoreMapper; import com.ruoyi.system.mapper.SysTrainingScoreMapper;
@ -47,7 +45,7 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
@Override @Override
public void insertByUserId(Long userId) { public void insertByUserId(Long userId) {
SysTrainingScore sysTrainingScore = new SysTrainingScore(); SysTrainingScoreWithBLOBs sysTrainingScore = new SysTrainingScoreWithBLOBs();
sysTrainingScore.setId(String.valueOf(UUID.randomUUID())); sysTrainingScore.setId(String.valueOf(UUID.randomUUID()));
sysTrainingScore.setUserid(userId); sysTrainingScore.setUserid(userId);
sysTrainingScore.setStatus(0); sysTrainingScore.setStatus(0);
@ -65,19 +63,19 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
@Override @Override
public SysTrainingScore checkStatusAndControlsName(Long userId, String controlsName) { public SysTrainingScoreWithBLOBs checkStatusAndControlsName(Long userId, String controlsName) {
SysTrainingScoreExample example = new SysTrainingScoreExample(); SysTrainingScoreExample example = new SysTrainingScoreExample();
SysTrainingScoreExample.Criteria criteria = example.createCriteria(); SysTrainingScoreExample.Criteria criteria = example.createCriteria();
criteria.andUseridEqualTo(userId); criteria.andUseridEqualTo(userId);
List<SysTrainingScore> trainingScores = trainingScoreMapper.selectByExample(example); List<SysTrainingScoreWithBLOBs> trainingScores = trainingScoreMapper.selectByExampleWithBLOBs(example);
SysTrainingScore sysTrainingScore = trainingScores.get(0); SysTrainingScoreWithBLOBs sysTrainingScore = trainingScores.get(0);
if (sysTrainingScore.getStatus() == 1) { if (sysTrainingScore.getStatus() == 1) {
return null; return null;
} else { } else {
if (sysTrainingScore.get(controlsName) == null || ("").equals(sysTrainingScore.get(controlsName)) || "null".equals(sysTrainingScore.get(controlsName))) { if (sysTrainingScore.get(controlsName) == null || ("").equals(sysTrainingScore.get(controlsName)) || "null".equals(sysTrainingScore.get(controlsName))) {
Map<String, Integer> trainingScoreConstantsMap = TrainingScoreConstants.getTrainingScoreConstantsMap(); Map<String, Integer> trainingScoreConstantsMap = TrainingScoreConstants.getTrainingScoreConstantsMap();
Integer score = trainingScoreConstantsMap.get(controlsName); Integer score = trainingScoreConstantsMap.get(controlsName);
SysTrainingScore trainingScore = new SysTrainingScore(); SysTrainingScoreWithBLOBs trainingScore = new SysTrainingScoreWithBLOBs();
trainingScore.setId(sysTrainingScore.getId()); trainingScore.setId(sysTrainingScore.getId());
trainingScore.set(controlsName, String.valueOf(score)); trainingScore.set(controlsName, String.valueOf(score));
if (controlsName.equals("dataCollectionStepDescription")) { if (controlsName.equals("dataCollectionStepDescription")) {
@ -93,7 +91,7 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
} }
public void updateByPrimaryKeySelective(SysTrainingScore trainingScore) { public void updateByPrimaryKeySelective(SysTrainingScoreWithBLOBs trainingScore) {
trainingScoreMapper.updateByPrimaryKeySelective(trainingScore); trainingScoreMapper.updateByPrimaryKeySelective(trainingScore);
} }
@ -144,9 +142,9 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
for (SysUser user : users) { for (SysUser user : users) {
SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample();
trainingScoreExample.createCriteria().andUseridEqualTo(user.getUserId()); trainingScoreExample.createCriteria().andUseridEqualTo(user.getUserId());
List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
if (!sysTrainingScores.isEmpty()) { if (!sysTrainingScores.isEmpty()) {
SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0);
// 检查是否已经存在分数 // 检查是否已经存在分数
if (sysTrainingScore.getTotalscore() != null && if (sysTrainingScore.getTotalscore() != null &&
sysTrainingScore.getTrainingReportScore() != null && sysTrainingScore.getTrainingReportScore() != null &&
@ -183,9 +181,9 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
for (SysUser sysUser : userList) { for (SysUser sysUser : userList) {
SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample();
trainingScoreExample.createCriteria().andUseridEqualTo(sysUser.getUserId()); trainingScoreExample.createCriteria().andUseridEqualTo(sysUser.getUserId());
List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
if (!sysTrainingScores.isEmpty()) { if (!sysTrainingScores.isEmpty()) {
SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0);
if (sysTrainingScore.getTotalscore() != null && if (sysTrainingScore.getTotalscore() != null &&
sysTrainingScore.getTrainingReportScore() != null && sysTrainingScore.getTrainingReportScore() != null &&
sysTrainingScore.getTrainingOperationScore() != null) { sysTrainingScore.getTrainingOperationScore() != null) {
@ -220,14 +218,15 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
} }
@Override @Override
public List<SysTrainingScore> selectAllReportContent() { public List<SysTrainingScoreWithBLOBs> selectAllReportContent() {
List<SysTrainingScore> trainingScores = trainingScoreMapper.selectAllReportContent(); // List<SysTrainingScoreWithBLOBs> trainingScores = trainingScoreMapper.selectAllReportContent();
return trainingScores; SysTrainingScoreExample e = new SysTrainingScoreExample();
return trainingScoreMapper.selectByExampleWithBLOBs(e);
} }
// 算分 // 算分
private ReportDto createReportDto(SysTrainingScore sysTrainingScore, SysUser user, Double reportWeight, Double operatorWeight) { private ReportDto createReportDto(SysTrainingScoreWithBLOBs sysTrainingScore, SysUser user, Double reportWeight, Double operatorWeight) {
DecimalFormat df = new DecimalFormat("#.##"); // 指定保留两位小数 DecimalFormat df = new DecimalFormat("#.##"); // 指定保留两位小数
ReportDto reportDto = new ReportDto(); ReportDto reportDto = new ReportDto();
reportDto.setFileName(sysTrainingScore.getReportFilename()); reportDto.setFileName(sysTrainingScore.getReportFilename());
@ -298,24 +297,24 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
String filePath = fileUtil.upload(file); String filePath = fileUtil.upload(file);
SysTrainingScoreExample sysTrainingScoreExample = new SysTrainingScoreExample(); SysTrainingScoreExample sysTrainingScoreExample = new SysTrainingScoreExample();
sysTrainingScoreExample.createCriteria().andUseridEqualTo(id); sysTrainingScoreExample.createCriteria().andUseridEqualTo(id);
List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(sysTrainingScoreExample); List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(sysTrainingScoreExample);
if (!sysTrainingScores.isEmpty()) { if (!sysTrainingScores.isEmpty()) {
SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); SysTrainingScoreWithBLOBs sysTrainingScoreWithBLOBs = sysTrainingScores.get(0);
if (sysTrainingScore != null && sysTrainingScore.getReportContent() != null && !sysTrainingScore.getReportContent().isEmpty()) { if (sysTrainingScoreWithBLOBs != null && "已提交".equals(sysTrainingScoreWithBLOBs.getReportstatus())) {
return AjaxResult.error(400,"报告已提交,不允许上传和修改"); return AjaxResult.error(400, "报告已提交,不允许上传和修改");
} }
if (sysTrainingScore != null && StringUtils.hasText(sysTrainingScore.getReportUploadPath())) { if (sysTrainingScoreWithBLOBs != null && StringUtils.hasText(sysTrainingScoreWithBLOBs.getReportUploadPath())) {
fileUtil.remove(sysTrainingScore.getReportUploadPath()); fileUtil.remove(sysTrainingScoreWithBLOBs.getReportUploadPath());
sysTrainingScore.setReportUploadPath(filePath); sysTrainingScoreWithBLOBs.setReportUploadPath(filePath);
sysTrainingScore.setReportFilename(fileName); sysTrainingScoreWithBLOBs.setReportFilename(fileName);
trainingScoreMapper.updateByExample(sysTrainingScore, sysTrainingScoreExample); trainingScoreMapper.updateByExample(sysTrainingScoreWithBLOBs, sysTrainingScoreExample);
return AjaxResult.success("上传成功"); return AjaxResult.success("上传成功");
} else { } else {
if (sysTrainingScore != null) { if (sysTrainingScoreWithBLOBs != null) {
sysTrainingScore.setReportUploadPath(filePath); sysTrainingScoreWithBLOBs.setReportUploadPath(filePath);
sysTrainingScore.setReportFilename(fileName); sysTrainingScoreWithBLOBs.setReportFilename(fileName);
} }
trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScoreWithBLOBs);
return AjaxResult.success("上传成功"); return AjaxResult.success("上传成功");
} }
} }
@ -328,28 +327,35 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
public AjaxResult saveOrSubmitReport(String content, Long userId, boolean isSubmit) { // isSubmit为true时提交 false保存 public AjaxResult saveOrSubmitReport(String content, Long userId, boolean isSubmit) { // isSubmit为true时提交 false保存
SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample();
trainingScoreExample.createCriteria().andUseridEqualTo(userId); trainingScoreExample.createCriteria().andUseridEqualTo(userId);
List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
if (!sysTrainingScores.isEmpty()) { if (!sysTrainingScores.isEmpty()) {
SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0);
if (StringUtils.isEmpty(sysTrainingScore.getReportstatus())) { if (StringUtils.isEmpty(sysTrainingScore.getReportstatus())) {
sysTrainingScore.setReportstatus("未提交"); // 设置默认值为"未提交" sysTrainingScore.setReportstatus("未提交"); // 设置默认值为"未提交"
} }
if (sysTrainingScore.getReportstatus().equals("已提交")) { // 检查报告状态,如果已提交,则不允许再次提交 if (sysTrainingScore.getReportstatus().equals("已提交")) { // 检查报告状态,如果已提交,则不允许再次提交
return AjaxResult.error(400,"报告已提交,不可重复提交,如需再次提交,请点击重新实训"); return AjaxResult.error(400, "报告已提交,不可重复提交,如需再次提交,请点击重新实训");
} }
if (isSubmit) { if (isSubmit) {
if (sysTrainingScore.getReportUploadPath() == null) { if (sysTrainingScore.getReportUploadPath() == null) {
return AjaxResult.error(400,"请先上传再提交"); return AjaxResult.error(400, "请先上传再提交");
}
if (sysTrainingScore.getReportSaveContent()!=null){
sysTrainingScore.setReportContent(sysTrainingScore.getReportSaveContent());
sysTrainingScore.setReportstatus("已提交");
trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);
return AjaxResult.success("提交成功");
}else {
sysTrainingScore.setReportContent(content);
sysTrainingScore.setReportstatus("已提交");
trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);
return AjaxResult.success("提交成功");
} }
sysTrainingScore.setReportContent(content);
sysTrainingScore.setReportstatus("已提交");
trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);
return AjaxResult.success("提交成功");
} else { } else {
if (sysTrainingScore.getReportstatus().equals("已提交")) { if (sysTrainingScore.getReportstatus().equals("已提交")) {
return AjaxResult.error(400,"报告已提交,无法修改"); return AjaxResult.error(400, "报告已提交,无法修改");
} }
sysTrainingScore.setReportContent(content); sysTrainingScore.setReportSaveContent(content);
trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);
return AjaxResult.success("保存成功"); return AjaxResult.success("保存成功");
} }
@ -408,9 +414,9 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
public void reportGrade(Integer reportScore, Long userId) { public void reportGrade(Integer reportScore, Long userId) {
SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample();
trainingScoreExample.createCriteria().andUseridEqualTo(userId); trainingScoreExample.createCriteria().andUseridEqualTo(userId);
List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
if (!sysTrainingScores.isEmpty()) { if (!sysTrainingScores.isEmpty()) {
SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0);
sysTrainingScore.setTrainingReportScore(reportScore); sysTrainingScore.setTrainingReportScore(reportScore);
sysTrainingScore.setPreTrainingReportScore(reportScore); sysTrainingScore.setPreTrainingReportScore(reportScore);
trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);

@ -7,7 +7,7 @@ import java.util.stream.Collectors;
import javax.validation.Validator; import javax.validation.Validator;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.SysTrainingScore; import com.ruoyi.system.domain.*;
import com.ruoyi.system.mapper.*; import com.ruoyi.system.mapper.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -24,15 +24,12 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanValidators; import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
/** /**
* *
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
@ -117,7 +114,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* ID * ID
* *
* @param userId ID * @param userId ID
* @return * @return
*/ */
@ -129,7 +126,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param userName * @param userName
* @return * @return
*/ */
@ -146,7 +143,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param userName * @param userName
* @return * @return
*/ */
@ -163,7 +160,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param userName * @param userName
* @return * @return
*/ */
@ -216,7 +213,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param user * @param user
*/ */
@Override @Override
@ -230,7 +227,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param userId id * @param userId id
*/ */
@Override @Override
@ -250,7 +247,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param user * @param user
* @return * @return
*/ */
@ -267,7 +264,7 @@ public class SysUserServiceImpl implements ISysUserService
insertUserRole(user); insertUserRole(user);
//新增实训成绩 //新增实训成绩
Long userId = userMapper.selectUserIDByStuNum(user.getStudentNumber()); Long userId = userMapper.selectUserIDByStuNum(user.getStudentNumber());
SysTrainingScore sysTrainingScore = new SysTrainingScore(); SysTrainingScoreWithBLOBs sysTrainingScore = new SysTrainingScoreWithBLOBs();
sysTrainingScore.setUserid(userId); sysTrainingScore.setUserid(userId);
sysTrainingScore.setStatus(0); sysTrainingScore.setStatus(0);
sysTrainingScore.setId(String.valueOf(UUID.randomUUID())); sysTrainingScore.setId(String.valueOf(UUID.randomUUID()));
@ -277,7 +274,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param user * @param user
* @return * @return
*/ */
@ -289,7 +286,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param user * @param user
* @return * @return
*/ */
@ -311,7 +308,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param userId ID * @param userId ID
* @param roleIds * @param roleIds
*/ */
@ -325,7 +322,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param user * @param user
* @return * @return
*/ */
@ -337,7 +334,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param user * @param user
* @return * @return
*/ */
@ -349,7 +346,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param userName * @param userName
* @param avatar * @param avatar
* @return * @return
@ -362,7 +359,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param user * @param user
* @return * @return
*/ */
@ -374,7 +371,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param userName * @param userName
* @param password * @param password
* @return * @return
@ -387,7 +384,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param user * @param user
*/ */
public void insertUserRole(SysUser user) public void insertUserRole(SysUser user)
@ -397,7 +394,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param user * @param user
*/ */
public void insertUserPost(SysUser user) public void insertUserPost(SysUser user)
@ -420,7 +417,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param userId ID * @param userId ID
* @param roleIds * @param roleIds
*/ */
@ -443,7 +440,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* ID * ID
* *
* @param userId ID * @param userId ID
* @return * @return
*/ */
@ -461,7 +458,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param userIds ID * @param userIds ID
* @return * @return
*/ */
@ -487,7 +484,7 @@ public class SysUserServiceImpl implements ISysUserService
/** /**
* *
* *
* @param userList * @param userList
* @param isUpdateSupport * @param isUpdateSupport
* @param operName * @param operName

Loading…
Cancel
Save