diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/IndustryDemandAnalysisController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/IndustryDemandAnalysisController.java index aa624c7..9463e76 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/IndustryDemandAnalysisController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/IndustryDemandAnalysisController.java @@ -129,17 +129,21 @@ public class IndustryDemandAnalysisController { BigDecimal subtract = BigDecimal.valueOf(100).subtract(Convert.toBigDecimal(count)); - StuGrade stuGrade = new StuGrade(Constant.PRO_SCXQWJ, - Constant.MODULE_HYXQFX, - Convert.toBigDecimal(subtract), - analysisDTO.getSchoolId(), - analysisDTO.getUserId(), - analysisDTO.getName(), - analysisDTO.getClassId(), - analysisDTO.getClassName(), - analysisDTO.getContext()); - - scoreService.submitScoreCalculation(stuGrade); + + scoreService.selectByUserId(analysisDTO.getUserId(), Constant.PRO_SCXQWJ,Constant.MODULE_HYXQFX,subtract,analysisDTO.getContext()); + + +// StuGrade stuGrade = new StuGrade(Constant.PRO_SCXQWJ, +// Constant.MODULE_HYXQFX, +// Convert.toBigDecimal(subtract), +// analysisDTO.getSchoolId(), +// analysisDTO.getUserId(), +// analysisDTO.getName(), +// analysisDTO.getClassId(), +// analysisDTO.getClassName(), +// analysisDTO.getContext()); + + return new ResultEntity<>(HttpStatus.OK, "上传成功"); diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/StuGrade.java b/src/main/java/com/sztzjy/linkCommerce/entity/StuGrade.java index e52d440..a1fcf7a 100644 --- a/src/main/java/com/sztzjy/linkCommerce/entity/StuGrade.java +++ b/src/main/java/com/sztzjy/linkCommerce/entity/StuGrade.java @@ -48,8 +48,10 @@ public class StuGrade { @ApiModelProperty(notes = "主观题答卷内容(建议存储为JSON格式)") private String content; + public StuGrade() { + } - public StuGrade( String project, String module, BigDecimal score, String schoolId, String userId, String name, String schoolClassId, String className, String content) { + public StuGrade(String project, String module, BigDecimal score, String schoolId, String userId, String name, String schoolClassId, String className, String content) { this.id = IdUtil.randomUUID(); this.project = project; this.module = module; diff --git a/src/main/java/com/sztzjy/linkCommerce/service/ScoreService.java b/src/main/java/com/sztzjy/linkCommerce/service/ScoreService.java index 62e620d..ed20f65 100644 --- a/src/main/java/com/sztzjy/linkCommerce/service/ScoreService.java +++ b/src/main/java/com/sztzjy/linkCommerce/service/ScoreService.java @@ -1,6 +1,9 @@ package com.sztzjy.linkCommerce.service; import com.sztzjy.linkCommerce.entity.StuGrade; +import io.swagger.annotations.ApiParam; + +import java.math.BigDecimal; /** * @author 17803 @@ -9,4 +12,7 @@ import com.sztzjy.linkCommerce.entity.StuGrade; public interface ScoreService { void submitScoreCalculation(StuGrade stuGrade); + + //查询学生信息 + void selectByUserId(String userId, @ApiParam("大模块")String project,@ApiParam("小模块") String module, BigDecimal score,@ApiParam("主观内容") String context); } diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/ScoreServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/ScoreServiceImpl.java index 5b45c6d..2966a35 100644 --- a/src/main/java/com/sztzjy/linkCommerce/service/impl/ScoreServiceImpl.java +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/ScoreServiceImpl.java @@ -1,11 +1,14 @@ package com.sztzjy.linkCommerce.service.impl; -import com.sztzjy.linkCommerce.entity.StuGrade; -import com.sztzjy.linkCommerce.entity.StuGradeExample; +import com.sztzjy.linkCommerce.config.exception.handler.ServiceException; +import com.sztzjy.linkCommerce.entity.*; +import com.sztzjy.linkCommerce.mapper.SchoolClassMapper; import com.sztzjy.linkCommerce.mapper.StuGradeMapper; +import com.sztzjy.linkCommerce.mapper.UserinfoMapper; import com.sztzjy.linkCommerce.service.ScoreService; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -39,9 +42,6 @@ public class ScoreServiceImpl implements ScoreService { if (CollectionUtils.isEmpty(stuGradeList)) { //传过来的得分 - - - stuGrade = scoreCalculation(stuGrade); @@ -59,6 +59,45 @@ public class ScoreServiceImpl implements ScoreService { } + } + + @Autowired + private UserinfoMapper userinfoMapper; + + @Autowired + private SchoolClassMapper schoolClassMapper; + + + + //根据用户ID查询数据 + @Override + public void selectByUserId(String userId,String project,String module,BigDecimal score,String context) { + UserinfoExample userinfoExample = new UserinfoExample(); + userinfoExample.createCriteria().andUserIdEqualTo(userId); + List userinfoList = userinfoMapper.selectByExample(userinfoExample); + if (!CollectionUtils.isEmpty(userinfoList)) { + Userinfo userinfo = userinfoList.get(0); + //查询班级和 + + //查询userinfo.getSchoolClassId() 班级名 + SchoolClass schoolClassInfo = schoolClassMapper.selectByPrimaryKey(userinfo.getSchoolClassId()); + + + StuGrade stuGrade = new StuGrade(project + ,module, + score, + userinfo.getSchoolId(), + userId, + userinfo.getName(), + userinfo.getSchoolClassId(), + schoolClassInfo.getClassName() + ,context); + submitScoreCalculation(stuGrade); + }else { + throw new ServiceException(HttpStatus.BAD_REQUEST,"用户数据不存在!"); + } + + } public StuGrade scoreCalculation(StuGrade stuGrade) {