From 9f21bd5bd4499363112d3a33284384e8eaa4086e Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Wed, 5 Oct 2022 21:46:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=9D=83=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TeacherOpenCourseScoreDashboardDao.java | 3 + .../TeacherOpenCourseScoreDashboard.java | 6 +- .../ResourcesQuestionSnapshotService.java | 1 + ...eacherOpenCourseScoreDashboardService.java | 64 +++++++++++++++++++ ...herOpenCourseScoreDashboardController.java | 9 +-- .../TeacherOpenCourseScoreDashboardQuery.java | 6 +- .../jlw/teacherOpenCourseScoreDashboard.md | 6 ++ 7 files changed, 85 insertions(+), 10 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java index b32fdf13..0a1f2f93 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java @@ -6,6 +6,7 @@ import java.util.Map; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.web.query.TeacherOpenCourseScoreDashboardQuery; +import org.beetl.sql.mapper.annotation.BatchUpdate; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.core.engine.PageQuery; @@ -25,4 +26,6 @@ public interface TeacherOpenCourseScoreDashboardDao extends BaseMapper getByIds(String ids); List getValuesByQuery(TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery); List>getExcelValues(TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery); + @Update + int deleteByTeacherOpenCourseId(Long teacherOpenCourseId); } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java index cc5b07ce..b0c62504 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScoreDashboard.java @@ -81,7 +81,7 @@ public class TeacherOpenCourseScoreDashboard extends BaseEntity{ private Date createTime ; //课程开课ID - private Date teacherOpenCourseId; + private Long teacherOpenCourseId; public TeacherOpenCourseScoreDashboard(){ } @@ -281,11 +281,11 @@ public class TeacherOpenCourseScoreDashboard extends BaseEntity{ this.createTime = createTime; } - public Date getTeacherOpenCourseId() { + public Long getTeacherOpenCourseId() { return teacherOpenCourseId; } - public void setTeacherOpenCourseId(Date teacherOpenCourseId) { + public void setTeacherOpenCourseId(Long teacherOpenCourseId) { this.teacherOpenCourseId = teacherOpenCourseId; } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java index fcd18f37..664414bc 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java @@ -216,6 +216,7 @@ public class ResourcesQuestionSnapshotService extends CoreBaseServicequeryByCondition(PageQuery query){ PageQuery ret = teacherOpenCourseScoreDashboardDao.queryByCondition(query); queryListAfter(ret.getList()); @@ -379,5 +385,63 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService studentScores = new ArrayList<>(); + for (int i = 0; i < 10; i++) { + TeacherOpenCourseScoreDashboard scoreDashboard = new TeacherOpenCourseScoreDashboard(); + scoreDashboard.setStudentId(i+1L); + BigDecimal signinScore = BigDecimal.valueOf(new Random().nextInt(100)); + scoreDashboard.setSigninScore(signinScore); + BigDecimal courseScore = BigDecimal.valueOf(new Random().nextInt(100)); + scoreDashboard.setCourseScore(courseScore); + BigDecimal realOperationScore = BigDecimal.valueOf(new Random().nextInt(100)); + scoreDashboard.setRealOperationScore(realOperationScore); + BigDecimal questionHomeworkScore = BigDecimal.valueOf(new Random().nextInt(100)); + scoreDashboard.setQuestionHomeworkScore(questionHomeworkScore); + BigDecimal examScore = BigDecimal.valueOf(new Random().nextInt(100)); + scoreDashboard.setExamScore(examScore); + BigDecimal chatScore = BigDecimal.valueOf(new Random().nextInt(100)); + scoreDashboard.setChatScore(chatScore); + BigDecimal totalScore= signinScore.add(courseScore) + .add(realOperationScore) + .add(questionHomeworkScore) + .add(examScore) + .add(chatScore); + scoreDashboard.setTotalScore(totalScore); + if (weight != null) { + String resultStatusSetting = weight.getResultStatusSetting(); + if ("1".equals(resultStatusSetting)) { + if (NumberUtil.compare(totalScore.longValue(), Long.parseLong(weight.getDichotomyScore())) > 0) { + scoreDashboard.setLastStatus("及格"); + }else { + scoreDashboard.setLastStatus("不及格"); + } + }else { + if (NumberUtil.compare(totalScore.longValue(), 60) > 0) { + scoreDashboard.setLastStatus("及格"); + }else { + scoreDashboard.setLastStatus("不及格"); + } + } + } + + scoreDashboard.setTeacherOpenCourseId(teacherOpenCourseId); + studentScores.add(scoreDashboard); + } + + //通过课程id删除存量数据 + teacherOpenCourseScoreDashboardDao.deleteByTeacherOpenCourseId(teacherOpenCourseId); + teacherOpenCourseScoreDashboardDao.insertBatch(studentScores); + return true; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java index d02bbd6e..61e9015e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java @@ -432,13 +432,14 @@ public class TeacherOpenCourseScoreDashboardController { * @param map teacherOpenCourseId 课程开课ID * @return */ - @PostMapping("/updateGrades") + @PostMapping(MODEL + "/updateGrades.json") public JsonResult updateGrades(@RequestBody Map map) { - String teacherOpenCourseId = MapUtils.getString(map, "teacherOpenCourseId"); - if (StringUtils.isEmpty(teacherOpenCourseId)) { + Long teacherOpenCourseId = MapUtils.getLong(map, "teacherOpenCourseId"); + if (teacherOpenCourseId == null) { return JsonResult.failMessage("课程开课ID不能为空"); } - return JsonResult.success(); + boolean b = teacherOpenCourseScoreDashboardService.updateGrades(teacherOpenCourseId); + return JsonResult.success(b); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java index e9be0aa1..f251d75b 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScoreDashboardQuery.java @@ -48,7 +48,7 @@ public class TeacherOpenCourseScoreDashboardQuery extends PageParam { @Query(name = "创建时间", display = false) private Date createTime; @Query(name = "课程开课ID", display = false) - private Date teacherOpenCourseId; + private Long teacherOpenCourseId; private String teacherOpenCourseScoreDashboardIdPlural; @@ -151,11 +151,11 @@ public class TeacherOpenCourseScoreDashboardQuery extends PageParam { this.createTime = createTime; } - public Date getTeacherOpenCourseId() { + public Long getTeacherOpenCourseId() { return teacherOpenCourseId; } - public void setTeacherOpenCourseId(Date teacherOpenCourseId) { + public void setTeacherOpenCourseId(Long teacherOpenCourseId) { this.teacherOpenCourseId = teacherOpenCourseId; } diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseScoreDashboard.md b/web/src/main/resources/sql/jlw/teacherOpenCourseScoreDashboard.md index 498c858e..baae482a 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseScoreDashboard.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseScoreDashboard.md @@ -570,3 +570,9 @@ getExcelValues ) )t +deleteByTeacherOpenCourseId +=== +* 根据课程id删除存量数据 + + delete from teacher_open_course_score_dashboard where teacher_open_course_id = #teacherOpenCourseId# +