diff --git a/.gitignore b/.gitignore index 1094bc2..2371a3b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,34 +1,58 @@ -HELP.md +# ignore these folders target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated +.idea/ +.settings/ +.vscode/ +bin/ +out/ + +# ignore these files .classpath -.factorypath .project .settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### .idea -*.iws + +# filter databfile、sln file +*.mdb +*.ldb +*.sln + +# class file +*.com +*.class +*.dll +*.exe +*.o +*.so + +# compression file +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip +*.via +*.tmp +*.err +*.log *.iml -*.ipr -.log -.jar -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ + +# OS generated files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +Icon? +ehthumbs.db +Thumbs.db +.factorypath +.mvn/ +mvnw.cmd +mvnw + +# Files or folders need to be retained +# ... \ No newline at end of file diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java index 61a4cd9..a6858c7 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java @@ -19,8 +19,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; //实训演练-实训案例-实验实训 @RestController @@ -97,70 +97,115 @@ public class ExerciseExperimentalTraining { } } - @AnonymousAccess - @ApiOperation("实训演练页面查询") - @PostMapping("getCourseChapter") - public ResultEntity> getIndexTheoryTest(@RequestParam String userId) { - List sysCourseList = sysCourseMapper.getBySchoolId(); - List dtoList = new ArrayList<>(); - for (SysCourse sysCourse : sysCourseList) { - SysCourseDto newDto = new SysCourseDto(); - BeanUtils.copyProperties(sysCourse, newDto); - String courseId = newDto.getCourseId(); - SysCourseChapterExample courseChapterExample = new SysCourseChapterExample(); - courseChapterExample.createCriteria().andCourseIdEqualTo(courseId); - courseChapterExample.setOrderByClause("sequence ASC"); - List sysCourseChapters = sysCourseChapterMapper.selectByExample(courseChapterExample); - List CourseChapterDtoList = new ArrayList<>(); - - for (SysCourseChapter sysCourseChapter : sysCourseChapters) { - SysCourseChapterDto sysCourseChapterDto = new SysCourseChapterDto(); - BeanUtils.copyProperties(sysCourseChapter, sysCourseChapterDto); - BigDecimal progress = stuTrainingMapper.getByUserIdAndChapterId(userId, sysCourseChapter.getChapterId()); - sysCourseChapterDto.setSchedule(progress); - CourseChapterDtoList.add(sysCourseChapterDto); - } - newDto.setSysCourseChapterDtos(CourseChapterDtoList); - dtoList.add(newDto); - } - return new ResultEntity>(dtoList); - } - -// // @AnonymousAccess // @ApiOperation("实训演练页面查询") // @PostMapping("getCourseChapter") // public ResultEntity> getIndexTheoryTest(@RequestParam String userId) { // List sysCourseList = sysCourseMapper.getBySchoolId(); // List dtoList = new ArrayList<>(); +// Map map = new HashMap<>(); // for (SysCourse sysCourse : sysCourseList) { // SysCourseDto newDto = new SysCourseDto(); // BeanUtils.copyProperties(sysCourse, newDto); // String courseId = newDto.getCourseId(); +// map.put(courseId,newDto); // SysCourseChapterExample courseChapterExample = new SysCourseChapterExample(); // courseChapterExample.createCriteria().andCourseIdEqualTo(courseId); // courseChapterExample.setOrderByClause("sequence ASC"); // List sysCourseChapters = sysCourseChapterMapper.selectByExample(courseChapterExample); // List CourseChapterDtoList = new ArrayList<>(); +// +// List chapterIds = new ArrayList<>(); // for (SysCourseChapter sysCourseChapter : sysCourseChapters) { -//// stuTrainingMapper.getByUserIdAndChaptetId() // SysCourseChapterDto sysCourseChapterDto = new SysCourseChapterDto(); // BeanUtils.copyProperties(sysCourseChapter, sysCourseChapterDto); -// StuTrainingExample example = new StuTrainingExample(); -// example.createCriteria().andUserIdEqualTo(userId).andChapterIdEqualTo(sysCourseChapter.getChapterId()); -// List list = stuTrainingMapper.selectByExampleWithBLOBs(example); -// if (!list.isEmpty()) { -// StuTrainingWithBLOBs stuTrainingWithBLOBs = list.get(0); -// sysCourseChapterDto.setSchedule(stuTrainingWithBLOBs.getProgress()); -// } +// String chapterId = sysCourseChapter.getChapterId(); +// BigDecimal progress = stuTrainingMapper.getByUserIdAndChapterId(userId, chapterId); +// sysCourseChapterDto.setSchedule(progress); // CourseChapterDtoList.add(sysCourseChapterDto); +// chapterIds.add(chapterId); // } +// SysCaseQuestionExample example = new SysCaseQuestionExample(); +// example.createCriteria().andChapterIdIn(chapterIds); +// List list = caseQuestionMapper.selectByExample(example); +// List caseIds = list.stream().map(SysCaseQuestion::getCaseId).collect(Collectors.toList()); +// SysCaseQuestionStepExample sysCaseQuestionStepExample = new SysCaseQuestionStepExample(); +// sysCaseQuestionStepExample.createCriteria().andCaseIdIn(caseIds); +// List sysCaseQuestionSteps = caseQuestionStepMapper.selectByExample(sysCaseQuestionStepExample); +// Map collect = sysCaseQuestionSteps.stream().collect(Collectors.toMap(SysCaseQuestionStep::getCaseStepId,SysCaseQuestionStep::getTitle)); +// newDto.setTitleAndId(collect); // newDto.setSysCourseChapterDtos(CourseChapterDtoList); // dtoList.add(newDto); // } // return new ResultEntity>(dtoList); // } +// + + + @AnonymousAccess + @ApiOperation("实训演练页面查询") + @PostMapping("getCourseChapter") + public ResultEntity> getIndexTheoryTest(@RequestParam String userId) { + List sysCourseList = sysCourseMapper.getBySchoolId(); + List dtoList = new ArrayList<>(); + + List courseIds = sysCourseList.stream() + .map(SysCourse::getCourseId) + .collect(Collectors.toList()); + + + List sysCourseChapters = sysCourseChapterMapper.getChaptersByCourseIds(courseIds); + List courseChapterIds = sysCourseChapters.stream().map(SysCourseChapter::getChapterId).collect(Collectors.toList()); + + Map> idMap = new HashMap<>(); + for (SysCourse sysCourse : sysCourseList) { + String courseId = sysCourse.getCourseId(); + List chapterIds = sysCourseChapters.stream() + .filter(chapter -> chapter.getCourseId().equals(courseId)) + .map(SysCourseChapter::getChapterId) + .collect(Collectors.toList()); + idMap.put(courseId, chapterIds); + } + //为循环提供数据 + List progressByChapterIds = stuTrainingMapper.getByUserIdAndChapterIds(userId, courseChapterIds); //循环外先查出所有进度 + Map progressMap = progressByChapterIds.stream() + .collect(Collectors.toMap(StuTraining::getChapterId, + stuTraining -> Optional.ofNullable(stuTraining.getProgress()).orElse(BigDecimal.ZERO), + (p1, p2) -> p1)); // 默认值为 BigDecimal.ZERO //进度为空则给0 + + //一层一层查出 课程,章节,章节下案例题 + for (SysCourse sysCourse : sysCourseList) { + SysCourseDto newDto = new SysCourseDto(); + BeanUtils.copyProperties(sysCourse, newDto); + String courseId = newDto.getCourseId(); + List CourseChapterDtoList = new ArrayList<>(); + for (SysCourseChapter sysCourseChapter : sysCourseChapters) { + SysCourseChapterDto sysCourseChapterDto = new SysCourseChapterDto(); + BeanUtils.copyProperties(sysCourseChapter, sysCourseChapterDto); + String chapterId = sysCourseChapter.getChapterId(); + BigDecimal progress = progressMap.get(chapterId); + sysCourseChapterDto.setSchedule(progress); + CourseChapterDtoList.add(sysCourseChapterDto); + } + //查询案例题 + List list1 = idMap.get(courseId); //取出章节ID + SysCaseQuestionExample example = new SysCaseQuestionExample(); + example.createCriteria().andChapterIdIn(list1); + List list = caseQuestionMapper.selectByExample(example); + List caseIds = list.stream().map(SysCaseQuestion::getCaseId).collect(Collectors.toList()); + SysCaseQuestionStepExample sysCaseQuestionStepExample = new SysCaseQuestionStepExample(); + sysCaseQuestionStepExample.createCriteria().andCaseIdIn(caseIds); + List sysCaseQuestionSteps = caseQuestionStepMapper.selectByExample(sysCaseQuestionStepExample); + Map collect = sysCaseQuestionSteps.stream().collect(Collectors.toMap(SysCaseQuestionStep::getCaseStepId, SysCaseQuestionStep::getTitle)); + newDto.setSysCourseChapterDtos(CourseChapterDtoList); + dtoList.add(newDto); + newDto.setTitleAndId(collect); + newDto.setSysCourseChapterDtos(CourseChapterDtoList); + dtoList.add(newDto); + } + return new ResultEntity>(dtoList); + } //数据集下载 diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java index db0ff85..773e507 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java @@ -1,5 +1,5 @@ package com.sztzjy.financial_bigdata.controller.tea; - +import javax.swing.JOptionPane; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -22,7 +22,6 @@ import com.sztzjy.financial_bigdata.util.excel.FilePortUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import lombok.Synchronized; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -39,6 +38,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.time.LocalDateTime; import java.util.*; +import java.util.stream.Collectors; /** * @Author xcj @@ -66,6 +66,30 @@ public class UserController { private static String loginIp; +// public static void main(String[] args) { +// StuUser a = new StuUser(); +// a.setPhone("111"); +// a.setUserid("111"); +// StuUser a2 = new StuUser(); +// a2.setPhone("111"); +// a2.setUserid("111"); +// StuUser a3 = new StuUser(); +// a3.setPhone("222"); +// a3.setUserid("111"); +// List list = new ArrayList<>(); +// list.add(a); +// list.add(a2); +// list.add(a3); +// List collect = list.stream().map(StuUser::getPhone).collect(Collectors.toList()); +// Map collect1 = list.stream() +// .collect(Collectors.toMap(StuUser::getPhone, StuUser::getUserid,(w, ww) -> w)); +//// System.out.println(collect); +// System.out.println(collect1); + +// } + + + @PostMapping("/login") @ApiOperation("登录接口") @AnonymousAccess @@ -97,7 +121,6 @@ public class UserController { if (stuUsers.isEmpty()) { return new ResultEntity(HttpStatus.BAD_REQUEST, "密码错误"); } - StuUser user1 = stuUsers.get(0); // 保存用户的登录信息 Map map = new HashMap<>(); StuUser user = stuUsers.get(0); diff --git a/src/main/java/com/sztzjy/financial_bigdata/entity/StuUser.java b/src/main/java/com/sztzjy/financial_bigdata/entity/StuUser.java index 8eead5b..b27fbf0 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/entity/StuUser.java +++ b/src/main/java/com/sztzjy/financial_bigdata/entity/StuUser.java @@ -16,6 +16,27 @@ public class StuUser { @ApiModelProperty("姓名") private String name; + @Override + public String toString() { + return "StuUser{" + + "userid='" + userid + '\'' + + ", name='" + name + '\'' + + ", studentId='" + studentId + '\'' + + ", classId='" + classId + '\'' + + ", username='" + username + '\'' + + ", password='" + password + '\'' + + ", phone='" + phone + '\'' + + ", email='" + email + '\'' + + ", major='" + major + '\'' + + ", roleId=" + roleId + + ", createTime=" + createTime + + ", schoolId='" + schoolId + '\'' + + ", schoolName='" + schoolName + '\'' + + ", status=" + status + + ", examStatus='" + examStatus + '\'' + + '}'; + } + @ApiModelProperty("学号") private String studentId; diff --git a/src/main/java/com/sztzjy/financial_bigdata/entity/sys_dto/SysCourseDto.java b/src/main/java/com/sztzjy/financial_bigdata/entity/sys_dto/SysCourseDto.java index 6f50b49..4bbc6ae 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/entity/sys_dto/SysCourseDto.java +++ b/src/main/java/com/sztzjy/financial_bigdata/entity/sys_dto/SysCourseDto.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; +import java.util.Map; /** * @Author xcj @@ -29,5 +30,8 @@ public class SysCourseDto { @ApiModelProperty("0为老师导入 1为内置") private String inputType; + @ApiModelProperty("案例题名称和步骤ID") + private Map titleAndId; + private List sysCourseChapterDtos; } diff --git a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuTrainingMapper.java b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuTrainingMapper.java index fc80e12..4da7da8 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuTrainingMapper.java +++ b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuTrainingMapper.java @@ -5,12 +5,15 @@ import com.sztzjy.financial_bigdata.entity.StuTrainingExample; import com.sztzjy.financial_bigdata.entity.StuTrainingWithBLOBs; import java.math.BigDecimal; +import java.util.Arrays; import java.util.List; +import java.util.Map; import com.sztzjy.financial_bigdata.entity.tea_dto.TrainingDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.geolatte.geom.M; @Mapper public interface StuTrainingMapper { @@ -52,4 +55,6 @@ public interface StuTrainingMapper { @Select("SELECT progress FROM stu_training WHERE user_id = #{userId} AND chapter_id = #{chapterId}") BigDecimal getByUserIdAndChapterId(@Param("userId")String userId, @Param("chapterId")String chapterId); + + List getByUserIdAndChapterIds(@Param("userId") String userId, @Param("chapterIds") List chapterIds); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/financial_bigdata/mapper/SysCourseChapterMapper.java b/src/main/java/com/sztzjy/financial_bigdata/mapper/SysCourseChapterMapper.java index 7bcbd0f..5775061 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/mapper/SysCourseChapterMapper.java +++ b/src/main/java/com/sztzjy/financial_bigdata/mapper/SysCourseChapterMapper.java @@ -38,4 +38,8 @@ public interface SysCourseChapterMapper { BigDecimal selectChapterBySchoolId(@Param("schoolId")String schoolId); List selectChapterDataBySchoolId(@Param("schoolId")String schoolId); + + List getChapters(@Param("courseId") String courseId); + + List getChaptersByCourseIds(@Param("courseIds")List courseIds); } \ No newline at end of file diff --git a/src/main/resources/mapper/StuTrainingMapper.xml b/src/main/resources/mapper/StuTrainingMapper.xml index 4e624b9..5d225fd 100644 --- a/src/main/resources/mapper/StuTrainingMapper.xml +++ b/src/main/resources/mapper/StuTrainingMapper.xml @@ -1,500 +1,527 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + - - - - - - - training_id, user_id, chapter_id, progress, case_stu_score, knowledge_summary_score, + + + + training_id + , user_id, chapter_id, progress, case_stu_score, knowledge_summary_score, resource_learning_score, learning_eval_score, exp_training_score, knowledge_summary_complete_status, resource_learning_complete_status, learning_eval_complete_status, exp_training_complete_status, report_id - - - learning_eval_idList, learning_eval_answer, case_stu_answer, knowledge_note - - - - - - delete from stu_training - where training_id = #{trainingId,jdbcType=VARCHAR} - - - delete from stu_training - - - - - - insert into stu_training (training_id, user_id, chapter_id, - progress, case_stu_score, knowledge_summary_score, - resource_learning_score, learning_eval_score, - exp_training_score, knowledge_summary_complete_status, - resource_learning_complete_status, learning_eval_complete_status, - exp_training_complete_status, report_id, learning_eval_idList, - learning_eval_answer, case_stu_answer, - knowledge_note) - values (#{trainingId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{chapterId,jdbcType=VARCHAR}, - #{progress,jdbcType=DECIMAL}, #{caseStuScore,jdbcType=DECIMAL}, #{knowledgeSummaryScore,jdbcType=DECIMAL}, - #{resourceLearningScore,jdbcType=DECIMAL}, #{learningEvalScore,jdbcType=DECIMAL}, - #{expTrainingScore,jdbcType=DECIMAL}, #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, - #{resourceLearningCompleteStatus,jdbcType=INTEGER}, #{learningEvalCompleteStatus,jdbcType=INTEGER}, - #{expTrainingCompleteStatus,jdbcType=INTEGER}, #{reportId,jdbcType=VARCHAR}, #{learningEvalIdlist,jdbcType=LONGVARCHAR}, - #{learningEvalAnswer,jdbcType=LONGVARCHAR}, #{caseStuAnswer,jdbcType=LONGVARCHAR}, - #{knowledgeNote,jdbcType=LONGVARCHAR}) - - - insert into stu_training - - - training_id, - - - user_id, - - - chapter_id, - - - progress, - - - case_stu_score, - - - knowledge_summary_score, - - - resource_learning_score, - - - learning_eval_score, - - - exp_training_score, - - - knowledge_summary_complete_status, - - - resource_learning_complete_status, - - - learning_eval_complete_status, - - - exp_training_complete_status, - - - report_id, - - - learning_eval_idList, - - - learning_eval_answer, - - - case_stu_answer, - - - knowledge_note, - - - - - #{trainingId,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{chapterId,jdbcType=VARCHAR}, - - - #{progress,jdbcType=DECIMAL}, - - - #{caseStuScore,jdbcType=DECIMAL}, - - - #{knowledgeSummaryScore,jdbcType=DECIMAL}, - - - #{resourceLearningScore,jdbcType=DECIMAL}, - - - #{learningEvalScore,jdbcType=DECIMAL}, - - - #{expTrainingScore,jdbcType=DECIMAL}, - - - #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, - - - #{resourceLearningCompleteStatus,jdbcType=INTEGER}, - - - #{learningEvalCompleteStatus,jdbcType=INTEGER}, - - - #{expTrainingCompleteStatus,jdbcType=INTEGER}, - - - #{reportId,jdbcType=VARCHAR}, - - - #{learningEvalIdlist,jdbcType=LONGVARCHAR}, - - - #{learningEvalAnswer,jdbcType=LONGVARCHAR}, - - - #{caseStuAnswer,jdbcType=LONGVARCHAR}, - - - #{knowledgeNote,jdbcType=LONGVARCHAR}, - - - - - - update stu_training - - - training_id = #{record.trainingId,jdbcType=VARCHAR}, - - + + + learning_eval_idList + , learning_eval_answer, case_stu_answer, knowledge_note + + + + + + delete + from stu_training + where training_id = #{trainingId,jdbcType=VARCHAR} + + + delete from stu_training + + + + + + insert into stu_training (training_id, user_id, chapter_id, + progress, case_stu_score, knowledge_summary_score, + resource_learning_score, learning_eval_score, + exp_training_score, knowledge_summary_complete_status, + resource_learning_complete_status, learning_eval_complete_status, + exp_training_complete_status, report_id, learning_eval_idList, + learning_eval_answer, case_stu_answer, + knowledge_note) + values (#{trainingId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{chapterId,jdbcType=VARCHAR}, + #{progress,jdbcType=DECIMAL}, #{caseStuScore,jdbcType=DECIMAL}, + #{knowledgeSummaryScore,jdbcType=DECIMAL}, + #{resourceLearningScore,jdbcType=DECIMAL}, #{learningEvalScore,jdbcType=DECIMAL}, + #{expTrainingScore,jdbcType=DECIMAL}, #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, + #{resourceLearningCompleteStatus,jdbcType=INTEGER}, #{learningEvalCompleteStatus,jdbcType=INTEGER}, + #{expTrainingCompleteStatus,jdbcType=INTEGER}, #{reportId,jdbcType=VARCHAR}, + #{learningEvalIdlist,jdbcType=LONGVARCHAR}, + #{learningEvalAnswer,jdbcType=LONGVARCHAR}, #{caseStuAnswer,jdbcType=LONGVARCHAR}, + #{knowledgeNote,jdbcType=LONGVARCHAR}) + + + insert into stu_training + + + training_id, + + + user_id, + + + chapter_id, + + + progress, + + + case_stu_score, + + + knowledge_summary_score, + + + resource_learning_score, + + + learning_eval_score, + + + exp_training_score, + + + knowledge_summary_complete_status, + + + resource_learning_complete_status, + + + learning_eval_complete_status, + + + exp_training_complete_status, + + + report_id, + + + learning_eval_idList, + + + learning_eval_answer, + + + case_stu_answer, + + + knowledge_note, + + + + + #{trainingId,jdbcType=VARCHAR}, + + + #{userId,jdbcType=VARCHAR}, + + + #{chapterId,jdbcType=VARCHAR}, + + + #{progress,jdbcType=DECIMAL}, + + + #{caseStuScore,jdbcType=DECIMAL}, + + + #{knowledgeSummaryScore,jdbcType=DECIMAL}, + + + #{resourceLearningScore,jdbcType=DECIMAL}, + + + #{learningEvalScore,jdbcType=DECIMAL}, + + + #{expTrainingScore,jdbcType=DECIMAL}, + + + #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, + + + #{resourceLearningCompleteStatus,jdbcType=INTEGER}, + + + #{learningEvalCompleteStatus,jdbcType=INTEGER}, + + + #{expTrainingCompleteStatus,jdbcType=INTEGER}, + + + #{reportId,jdbcType=VARCHAR}, + + + #{learningEvalIdlist,jdbcType=LONGVARCHAR}, + + + #{learningEvalAnswer,jdbcType=LONGVARCHAR}, + + + #{caseStuAnswer,jdbcType=LONGVARCHAR}, + + + #{knowledgeNote,jdbcType=LONGVARCHAR}, + + + + + + update stu_training + + + training_id = #{record.trainingId,jdbcType=VARCHAR}, + + + user_id = #{record.userId,jdbcType=VARCHAR}, + + + chapter_id = #{record.chapterId,jdbcType=VARCHAR}, + + + progress = #{record.progress,jdbcType=DECIMAL}, + + + case_stu_score = #{record.caseStuScore,jdbcType=DECIMAL}, + + + knowledge_summary_score = #{record.knowledgeSummaryScore,jdbcType=DECIMAL}, + + + resource_learning_score = #{record.resourceLearningScore,jdbcType=DECIMAL}, + + + learning_eval_score = #{record.learningEvalScore,jdbcType=DECIMAL}, + + + exp_training_score = #{record.expTrainingScore,jdbcType=DECIMAL}, + + + knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, + + + resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=INTEGER}, + + + learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=INTEGER}, + + + exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=INTEGER}, + + + report_id = #{record.reportId,jdbcType=VARCHAR}, + + + learning_eval_idList = #{record.learningEvalIdlist,jdbcType=LONGVARCHAR}, + + + learning_eval_answer = #{record.learningEvalAnswer,jdbcType=LONGVARCHAR}, + + + case_stu_answer = #{record.caseStuAnswer,jdbcType=LONGVARCHAR}, + + + knowledge_note = #{record.knowledgeNote,jdbcType=LONGVARCHAR}, + + + + + + + + update stu_training + set training_id = #{record.trainingId,jdbcType=VARCHAR}, user_id = #{record.userId,jdbcType=VARCHAR}, - - chapter_id = #{record.chapterId,jdbcType=VARCHAR}, - - progress = #{record.progress,jdbcType=DECIMAL}, - - case_stu_score = #{record.caseStuScore,jdbcType=DECIMAL}, - - knowledge_summary_score = #{record.knowledgeSummaryScore,jdbcType=DECIMAL}, - - resource_learning_score = #{record.resourceLearningScore,jdbcType=DECIMAL}, - - learning_eval_score = #{record.learningEvalScore,jdbcType=DECIMAL}, - - exp_training_score = #{record.expTrainingScore,jdbcType=DECIMAL}, - - knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, - - resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=INTEGER}, - - learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=INTEGER}, - - exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=INTEGER}, - - report_id = #{record.reportId,jdbcType=VARCHAR}, - - learning_eval_idList = #{record.learningEvalIdlist,jdbcType=LONGVARCHAR}, - - learning_eval_answer = #{record.learningEvalAnswer,jdbcType=LONGVARCHAR}, - - case_stu_answer = #{record.caseStuAnswer,jdbcType=LONGVARCHAR}, - - - knowledge_note = #{record.knowledgeNote,jdbcType=LONGVARCHAR}, - - - - - - - - update stu_training - set training_id = #{record.trainingId,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - chapter_id = #{record.chapterId,jdbcType=VARCHAR}, - progress = #{record.progress,jdbcType=DECIMAL}, - case_stu_score = #{record.caseStuScore,jdbcType=DECIMAL}, - knowledge_summary_score = #{record.knowledgeSummaryScore,jdbcType=DECIMAL}, - resource_learning_score = #{record.resourceLearningScore,jdbcType=DECIMAL}, - learning_eval_score = #{record.learningEvalScore,jdbcType=DECIMAL}, - exp_training_score = #{record.expTrainingScore,jdbcType=DECIMAL}, - knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, - resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=INTEGER}, - learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=INTEGER}, - exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=INTEGER}, - report_id = #{record.reportId,jdbcType=VARCHAR}, - learning_eval_idList = #{record.learningEvalIdlist,jdbcType=LONGVARCHAR}, - learning_eval_answer = #{record.learningEvalAnswer,jdbcType=LONGVARCHAR}, - case_stu_answer = #{record.caseStuAnswer,jdbcType=LONGVARCHAR}, - knowledge_note = #{record.knowledgeNote,jdbcType=LONGVARCHAR} - - - - - - update stu_training - set training_id = #{record.trainingId,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - chapter_id = #{record.chapterId,jdbcType=VARCHAR}, - progress = #{record.progress,jdbcType=DECIMAL}, - case_stu_score = #{record.caseStuScore,jdbcType=DECIMAL}, - knowledge_summary_score = #{record.knowledgeSummaryScore,jdbcType=DECIMAL}, - resource_learning_score = #{record.resourceLearningScore,jdbcType=DECIMAL}, - learning_eval_score = #{record.learningEvalScore,jdbcType=DECIMAL}, - exp_training_score = #{record.expTrainingScore,jdbcType=DECIMAL}, - knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, - resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=INTEGER}, - learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=INTEGER}, - exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=INTEGER}, - report_id = #{record.reportId,jdbcType=VARCHAR} - - - - - - update stu_training - - - user_id = #{userId,jdbcType=VARCHAR}, - - - chapter_id = #{chapterId,jdbcType=VARCHAR}, - - - progress = #{progress,jdbcType=DECIMAL}, - - - case_stu_score = #{caseStuScore,jdbcType=DECIMAL}, - - - knowledge_summary_score = #{knowledgeSummaryScore,jdbcType=DECIMAL}, - - - resource_learning_score = #{resourceLearningScore,jdbcType=DECIMAL}, - - - learning_eval_score = #{learningEvalScore,jdbcType=DECIMAL}, - - - exp_training_score = #{expTrainingScore,jdbcType=DECIMAL}, - - - knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, - - - resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=INTEGER}, - - - learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=INTEGER}, - - - exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=INTEGER}, - - - report_id = #{reportId,jdbcType=VARCHAR}, - - - learning_eval_idList = #{learningEvalIdlist,jdbcType=LONGVARCHAR}, - - - learning_eval_answer = #{learningEvalAnswer,jdbcType=LONGVARCHAR}, - - - case_stu_answer = #{caseStuAnswer,jdbcType=LONGVARCHAR}, - - - knowledge_note = #{knowledgeNote,jdbcType=LONGVARCHAR}, - - - where training_id = #{trainingId,jdbcType=VARCHAR} - - - update stu_training - set user_id = #{userId,jdbcType=VARCHAR}, - chapter_id = #{chapterId,jdbcType=VARCHAR}, - progress = #{progress,jdbcType=DECIMAL}, - case_stu_score = #{caseStuScore,jdbcType=DECIMAL}, - knowledge_summary_score = #{knowledgeSummaryScore,jdbcType=DECIMAL}, - resource_learning_score = #{resourceLearningScore,jdbcType=DECIMAL}, - learning_eval_score = #{learningEvalScore,jdbcType=DECIMAL}, - exp_training_score = #{expTrainingScore,jdbcType=DECIMAL}, - knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, - resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=INTEGER}, - learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=INTEGER}, - exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=INTEGER}, - report_id = #{reportId,jdbcType=VARCHAR}, - learning_eval_idList = #{learningEvalIdlist,jdbcType=LONGVARCHAR}, - learning_eval_answer = #{learningEvalAnswer,jdbcType=LONGVARCHAR}, - case_stu_answer = #{caseStuAnswer,jdbcType=LONGVARCHAR}, - knowledge_note = #{knowledgeNote,jdbcType=LONGVARCHAR} - where training_id = #{trainingId,jdbcType=VARCHAR} - - - update stu_training - set user_id = #{userId,jdbcType=VARCHAR}, - chapter_id = #{chapterId,jdbcType=VARCHAR}, - progress = #{progress,jdbcType=DECIMAL}, - case_stu_score = #{caseStuScore,jdbcType=DECIMAL}, - knowledge_summary_score = #{knowledgeSummaryScore,jdbcType=DECIMAL}, - resource_learning_score = #{resourceLearningScore,jdbcType=DECIMAL}, - learning_eval_score = #{learningEvalScore,jdbcType=DECIMAL}, - exp_training_score = #{expTrainingScore,jdbcType=DECIMAL}, - knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, - resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=INTEGER}, - learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=INTEGER}, - exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=INTEGER}, - report_id = #{reportId,jdbcType=VARCHAR} - where training_id = #{trainingId,jdbcType=VARCHAR} - - - - - - - - - + knowledge_note = #{record.knowledgeNote,jdbcType=LONGVARCHAR} + + + + + + update stu_training + set training_id = #{record.trainingId,jdbcType=VARCHAR}, + user_id = #{record.userId,jdbcType=VARCHAR}, + chapter_id = #{record.chapterId,jdbcType=VARCHAR}, + progress = #{record.progress,jdbcType=DECIMAL}, + case_stu_score = #{record.caseStuScore,jdbcType=DECIMAL}, + knowledge_summary_score = #{record.knowledgeSummaryScore,jdbcType=DECIMAL}, + resource_learning_score = #{record.resourceLearningScore,jdbcType=DECIMAL}, + learning_eval_score = #{record.learningEvalScore,jdbcType=DECIMAL}, + exp_training_score = #{record.expTrainingScore,jdbcType=DECIMAL}, + knowledge_summary_complete_status = #{record.knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, + resource_learning_complete_status = #{record.resourceLearningCompleteStatus,jdbcType=INTEGER}, + learning_eval_complete_status = #{record.learningEvalCompleteStatus,jdbcType=INTEGER}, + exp_training_complete_status = #{record.expTrainingCompleteStatus,jdbcType=INTEGER}, + report_id = #{record.reportId,jdbcType=VARCHAR} + + + + + + update stu_training + + + user_id = #{userId,jdbcType=VARCHAR}, + + + chapter_id = #{chapterId,jdbcType=VARCHAR}, + + + progress = #{progress,jdbcType=DECIMAL}, + + + case_stu_score = #{caseStuScore,jdbcType=DECIMAL}, + + + knowledge_summary_score = #{knowledgeSummaryScore,jdbcType=DECIMAL}, + + + resource_learning_score = #{resourceLearningScore,jdbcType=DECIMAL}, + + + learning_eval_score = #{learningEvalScore,jdbcType=DECIMAL}, + + + exp_training_score = #{expTrainingScore,jdbcType=DECIMAL}, + + + knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, + + + resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=INTEGER}, + + + learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=INTEGER}, + + + exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=INTEGER}, + + + report_id = #{reportId,jdbcType=VARCHAR}, + + + learning_eval_idList = #{learningEvalIdlist,jdbcType=LONGVARCHAR}, + + + learning_eval_answer = #{learningEvalAnswer,jdbcType=LONGVARCHAR}, + + + case_stu_answer = #{caseStuAnswer,jdbcType=LONGVARCHAR}, + + + knowledge_note = #{knowledgeNote,jdbcType=LONGVARCHAR}, + + + where training_id = #{trainingId,jdbcType=VARCHAR} + + + update stu_training + set user_id = #{userId,jdbcType=VARCHAR}, + chapter_id = #{chapterId,jdbcType=VARCHAR}, + progress = #{progress,jdbcType=DECIMAL}, + case_stu_score = #{caseStuScore,jdbcType=DECIMAL}, + knowledge_summary_score = #{knowledgeSummaryScore,jdbcType=DECIMAL}, + resource_learning_score = #{resourceLearningScore,jdbcType=DECIMAL}, + learning_eval_score = #{learningEvalScore,jdbcType=DECIMAL}, + exp_training_score = #{expTrainingScore,jdbcType=DECIMAL}, + knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, + resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=INTEGER}, + learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=INTEGER}, + exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=INTEGER}, + report_id = #{reportId,jdbcType=VARCHAR}, + learning_eval_idList = #{learningEvalIdlist,jdbcType=LONGVARCHAR}, + learning_eval_answer = #{learningEvalAnswer,jdbcType=LONGVARCHAR}, + case_stu_answer = #{caseStuAnswer,jdbcType=LONGVARCHAR}, + knowledge_note = #{knowledgeNote,jdbcType=LONGVARCHAR} + where training_id = #{trainingId,jdbcType=VARCHAR} + + + update stu_training + set user_id = #{userId,jdbcType=VARCHAR}, + chapter_id = #{chapterId,jdbcType=VARCHAR}, + progress = #{progress,jdbcType=DECIMAL}, + case_stu_score = #{caseStuScore,jdbcType=DECIMAL}, + knowledge_summary_score = #{knowledgeSummaryScore,jdbcType=DECIMAL}, + resource_learning_score = #{resourceLearningScore,jdbcType=DECIMAL}, + learning_eval_score = #{learningEvalScore,jdbcType=DECIMAL}, + exp_training_score = #{expTrainingScore,jdbcType=DECIMAL}, + knowledge_summary_complete_status = #{knowledgeSummaryCompleteStatus,jdbcType=INTEGER}, + resource_learning_complete_status = #{resourceLearningCompleteStatus,jdbcType=INTEGER}, + learning_eval_complete_status = #{learningEvalCompleteStatus,jdbcType=INTEGER}, + exp_training_complete_status = #{expTrainingCompleteStatus,jdbcType=INTEGER}, + report_id = #{reportId,jdbcType=VARCHAR} + where training_id = #{trainingId,jdbcType=VARCHAR} + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/main/resources/mapper/SysCourseChapterMapper.xml b/src/main/resources/mapper/SysCourseChapterMapper.xml index 0aa35bb..9e4fab7 100644 --- a/src/main/resources/mapper/SysCourseChapterMapper.xml +++ b/src/main/resources/mapper/SysCourseChapterMapper.xml @@ -207,4 +207,23 @@ WHERE sys_course.course_id = sys_course_chapter.course_id AND school_Id in (999999999, #{schoolId}) + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/SysCourseMapper.xml b/src/main/resources/mapper/SysCourseMapper.xml index 874fa03..11684de 100644 --- a/src/main/resources/mapper/SysCourseMapper.xml +++ b/src/main/resources/mapper/SysCourseMapper.xml @@ -84,7 +84,7 @@