diff --git a/src/main/java/com/jevon/controller/LearnController.java b/src/main/java/com/jevon/controller/LearnController.java index f959b68..5fc43e0 100644 --- a/src/main/java/com/jevon/controller/LearnController.java +++ b/src/main/java/com/jevon/controller/LearnController.java @@ -69,8 +69,9 @@ public class LearnController { analyse.setCourseName(createExamReqVo.getCourseName()); analyse.setExamName(createExamReqVo.getExamName()); analyse.setExamTime(createExamReqVo.getExamTime()); - int id = analyseService.insert(analyse); - baseVo.setMessage(id+""); + analyse.setCreateTime(new Date()); + analyseService.insert(analyse); + baseVo.setMessage(analyse.getId()+""); return baseVo; } @@ -179,7 +180,7 @@ public class LearnController { analyseDimensional.setAnalyseId(analyse.getId()); analyseDimensional.setDimensionalId(dimensionalId); analyseDimensional.setQuestionNumber(questionNumber); - analyseDimensional.setScore(new Float(score)); + analyseDimensional.setScore(new Double(score)); analyseDimensional.setCreateTime(new Date()); analyseDimensionals.add(analyseDimensional); } @@ -197,8 +198,6 @@ public class LearnController { private void analysisScoreExcel(InitAnalyseReqVo initAnalyseReqVo){ try{ - List studentDetails = new ArrayList<>(); - List students = new ArrayList<>(); Analyse analyse = analyseService.selectById(initAnalyseReqVo.getAnalyseId()); String fileUrl = initAnalyseReqVo.getUrl(); File excelFile = new File(fileUrl); @@ -211,47 +210,54 @@ public class LearnController { workbook = new XSSFWorkbook(new FileInputStream(excelFile)); } // 获得工作表 - Sheet sheet = workbook.getSheetAt(0); - Date date = new Date(); - int rows = sheet.getPhysicalNumberOfRows(); - Map map = new HashMap<>(); - for (int i = 0; i <= rows; i++) { - // 获取第i行数据 - Row sheetRow = sheet.getRow(i); - if (i == 0) { - //获取标题 - }else if(i == 1){ - //获取表头 - int j = 7 ; - while (sheetRow.getCell(j) != null){ - Cell cell = sheetRow.getCell(j); - cell.setCellType(CellType.STRING); - map.put(j,cell.getStringCellValue().trim()); - j++; - } - } else { - ScoreExcelVo scoreExcelVo = new ScoreExcelVo(sheetRow); - Student student = new Student(scoreExcelVo); - student.setAnalyseId(analyse.getId()); - student.setCreateTime(date); - students.add(student); - int j = 7 ; - while (sheetRow.getCell(j) != null){ - Cell cell = sheetRow.getCell(j); - StudentDetail studentDetail = new StudentDetail(scoreExcelVo); - studentDetail.setAnalyseId(analyse.getId()); - studentDetail.setExamNumber(map.get(j)); - studentDetail.setScore(new Float(cell.getNumericCellValue())); - studentDetail.setCreateTime(date); - studentDetails.add(studentDetail); - j++; + for(int number = 0 ; number < workbook.getNumberOfSheets() ; number++){ + Sheet sheet = workbook.getSheetAt(number); + List studentDetails = new ArrayList<>(); + List students = new ArrayList<>(); + Date date = new Date(); + int rows = sheet.getPhysicalNumberOfRows(); + Map map = new HashMap<>(); + for (int i = 0; i < rows; i++) { + // 获取第i行数据 + Row sheetRow = sheet.getRow(i); + if (i == 0) { + //获取标题 + }else if(i == 1){ + //获取表头 + int j = 7 ; + while (sheetRow.getCell(j) != null){ + Cell cell = sheetRow.getCell(j); + cell.setCellType(CellType.STRING); + map.put(j,cell.getStringCellValue().trim()); + j++; + } + } else { + ScoreExcelVo scoreExcelVo = new ScoreExcelVo(sheetRow); + if(StringUtils.isNotBlank(scoreExcelVo.getStudentName())){ + Student student = new Student(scoreExcelVo); + student.setAnalyseId(analyse.getId()); + student.setCreateTime(date); + students.add(student); + int j = 7 ; + while (sheetRow.getCell(j) != null){ + Cell cell = sheetRow.getCell(j); + StudentDetail studentDetail = new StudentDetail(scoreExcelVo); + studentDetail.setAnalyseId(analyse.getId()); + studentDetail.setExamNumber(map.get(j)); + studentDetail.setScore(new Double(cell.getNumericCellValue())); + studentDetail.setCreateTime(date); + studentDetails.add(studentDetail); + j++; + } + } } - } + } + studentService.insertBatch(students); + studentDetailService.insertBatch(studentDetails); } - studentService.insertBatch(students); - studentDetailService.insertBatch(studentDetails); }catch (Exception e){ - System.out.println(e); + e.printStackTrace(); + System.out.println(e.toString()); } } } diff --git a/src/main/java/com/jevon/controller/LearnStatController.java b/src/main/java/com/jevon/controller/LearnStatController.java index 796c2ee..b064ad9 100644 --- a/src/main/java/com/jevon/controller/LearnStatController.java +++ b/src/main/java/com/jevon/controller/LearnStatController.java @@ -1,10 +1,9 @@ package com.jevon.controller; -import com.jevon.model.Analyse; -import com.jevon.model.AnalyseDetail; -import com.jevon.model.Student; +import com.jevon.enums.DifficultEnums; +import com.jevon.enums.DimensionalEnums; +import com.jevon.model.*; import com.jevon.service.*; -import com.jevon.vo.BaseVo; import com.jevon.vo.req.GetLearnReqVo; import com.jevon.wordDTO.second.*; import io.swagger.annotations.Api; @@ -47,6 +46,26 @@ public class LearnStatController { @Autowired StudentService studentService; + @ApiOperation("getForm1_1") + @RequestMapping(value = "getForm1_1", method = RequestMethod.POST) + public List getForm1_1(@RequestBody GetLearnReqVo getLearnReqVo){ + Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); + List list = new ArrayList<>(); + Form7 form7 = new Form7(); + form7.setName(DifficultEnums.easy.getDifficultName()); + form7.setPercent(analyseDetailService.selectDifficult(analyse.getId(),DifficultEnums.easy.getDifficultType())/analyse.getMaxScore()*100); + list.add(form7); + Form7 form = new Form7(); + form.setName(DifficultEnums.medium.getDifficultName()); + form.setPercent(analyseDetailService.selectDifficult(analyse.getId(),DifficultEnums.medium.getDifficultType())/analyse.getMaxScore()*100); + list.add(form); + Form7 form2 = new Form7(); + form2.setName(DifficultEnums.difficult.getDifficultName()); + form2.setPercent(analyseDetailService.selectDifficult(analyse.getId(),DifficultEnums.difficult.getDifficultType())/analyse.getMaxScore()*100); + list.add(form2); + return list; + } + @ApiOperation("getForm2_1_1") @RequestMapping(value = "getForm2_1_1", method = RequestMethod.POST) public Form1RepVo getForm2_1_1(@RequestBody GetLearnReqVo getLearnReqVo){ @@ -98,7 +117,7 @@ public class LearnStatController { Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); List allStudents = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),null); List students = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName()); - //先算高分段的分数 再去人数 + //先算高分段的分数 int highNumber = (int) Math.floor(allStudents.size()*0.27); double highScore = allStudents.get(highNumber).getScore(); int lowNumber = allStudents.size()-highNumber; @@ -290,6 +309,7 @@ public class LearnStatController { Double schoolSumScore = studentDetailService.selectSumScore(analyse.getId(),getLearnReqVo.getSchoolName(),analyseDetail.getQuestionNumber()); from5.setExamNumber(analyseDetail.getQuestionNumber()); from5.setScore(analyseDetail.getScore()); + from5.setDifficultName(DifficultEnums.getDifficultName(analyseDetail.getDifficult())); from5.setAllRate(allSumScore/new Double(allStudents.size()) / analyseDetail.getScore()); from5.setSchoolRate(schoolSumScore/new Double(students.size()) / analyseDetail.getScore()); from5.setAllAvg(allSumScore / new Double(allStudents.size())); @@ -304,4 +324,110 @@ public class LearnStatController { } return list; } + + @ApiOperation("getForm2_2_4") + @RequestMapping(value = "getForm2_2_4", method = RequestMethod.POST) + public List getForm2_2_4(@RequestBody GetLearnReqVo getLearnReqVo){ + Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); + List list = new ArrayList<>(); + List allStudents = studentService.selectBySchoolName(analyse.getId(),null); + List students = studentService.selectBySchoolName(analyse.getId(),getLearnReqVo.getSchoolName()); + for(DifficultEnums enums : DifficultEnums.values()){ + Form8 form8 = new Form8(); + form8.setDifficultName(enums.getDifficultName()); + form8.setScore(analyseDetailService.selectDifficult(analyse.getId(),enums.getDifficultType())); + List analyseDetails = analyseDetailService.selectDifficultDetail(analyse.getId(),enums.getDifficultType()); + Double allSumScore = 0d , schoolSumScore = 0d , score = 0d; + for(AnalyseDetail analyseDetail : analyseDetails){ + allSumScore = allSumScore + studentDetailService.selectSumScore(analyse.getId(),null,analyseDetail.getQuestionNumber()); + schoolSumScore = schoolSumScore + studentDetailService.selectSumScore(analyse.getId(),getLearnReqVo.getSchoolName(),analyseDetail.getQuestionNumber()); + score = score + analyseDetail.getScore() ; + } + form8.setAllRate(allSumScore / new Double(allStudents.size()) / score ); + form8.setSchoolRate(schoolSumScore / new Double(students.size()) / score); + list.add(form8); + } + return list; + } + + @ApiOperation("getForm3_1") + @RequestMapping(value = "getForm3_1", method = RequestMethod.POST) + public List getForm3_1(@RequestBody GetLearnReqVo getLearnReqVo){ + return initDimensional(getLearnReqVo,DimensionalEnums.knowledge.getDimensionalType()); + } + + @ApiOperation("getForm3_2") + @RequestMapping(value = "getForm3_2", method = RequestMethod.POST) + public List getForm3_2(@RequestBody GetLearnReqVo getLearnReqVo){ + return initDimensional(getLearnReqVo,DimensionalEnums.skill.getDimensionalType()); + } + + @ApiOperation("getForm3_3") + @RequestMapping(value = "getForm3_3", method = RequestMethod.POST) + public List getForm3_3(@RequestBody GetLearnReqVo getLearnReqVo){ + return initDimensional(getLearnReqVo,DimensionalEnums.ability.getDimensionalType()); + } + + @ApiOperation("getForm3_4") + @RequestMapping(value = "getForm3_4", method = RequestMethod.POST) + public List getForm3_4(@RequestBody GetLearnReqVo getLearnReqVo){ + return initDimensional(getLearnReqVo,DimensionalEnums.think.getDimensionalType()); + } + + private List initDimensional(GetLearnReqVo getLearnReqVo , int dimensionalType){ + List list = new ArrayList<>(); + Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); + List allStudents = studentService.selectBySchoolName(analyse.getId(),null); + int allNumber = (int) Math.floor(allStudents.size()*0.27) ; + List allHighStudent = new ArrayList<>(); + List allLowStudent = new ArrayList<>(); + for (int i = 0; i < allNumber ; i++) { + allHighStudent.add(allStudents.get(i).getStudentNumber()); + } + for(int i =allStudents.size()-allNumber ; i < allStudents.size() ; i++){ + allLowStudent.add(allStudents.get(i).getStudentNumber()); + } + List students = studentService.selectBySchoolName(analyse.getId(),getLearnReqVo.getSchoolName()); + int number = (int) Math.floor(students.size()*0.27) ; + List highStudent = new ArrayList<>(); + List lowStudent = new ArrayList<>(); + for (int i = 0; i < number ; i++) { + highStudent.add(students.get(i).getStudentNumber()); + } + for(int i =students.size()-number ; i < students.size() ; i++){ + lowStudent.add(students.get(i).getStudentNumber()); + } + List knowledgeList = dimensionalService.selectByAnalyse(analyse.getId(),dimensionalType); + for(Dimensional dimensional : knowledgeList){ + Form6 form6 = new Form6(); + form6.setKnowledge(dimensional.getDimensionalName()); + List analyseDimensionals = analyseDimensionalService.selectByDimensional(analyse.getId(),dimensional.getId()); + Double score = 0d; + Double allSumScore = 0d ; + Double schoolSumScore = 0d ; + int allHigh = 0 , allLow = 0 , high = 0 , low = 0 ; + StringBuffer examNumber = new StringBuffer(); + for(AnalyseDimensional analyseDimensional :analyseDimensionals){ + score = score + analyseDimensional.getScore() ; + allSumScore = allSumScore + studentDetailService.selectSumScore(analyse.getId(),null,analyseDimensional.getQuestionNumber()); + schoolSumScore = schoolSumScore + studentDetailService.selectSumScore(analyse.getId(),getLearnReqVo.getSchoolName(),analyseDimensional.getQuestionNumber()); + allHigh = allHigh + studentDetailService.selectTrueByExamNumber(analyse.getId(),null ,analyseDimensional.getQuestionNumber(),allHighStudent,analyseDimensional.getScore()); + allLow = allLow + studentDetailService.selectTrueByExamNumber(analyse.getId(),null ,analyseDimensional.getQuestionNumber(),allLowStudent,analyseDimensional.getScore()); + high = high + studentDetailService.selectTrueByExamNumber(analyse.getId(),getLearnReqVo.getSchoolName() ,analyseDimensional.getQuestionNumber(),highStudent,analyseDimensional.getScore()); + low = low + studentDetailService.selectTrueByExamNumber(analyse.getId(),getLearnReqVo.getSchoolName() ,analyseDimensional.getQuestionNumber(),lowStudent,analyseDimensional.getScore()); + examNumber.append(analyseDimensional.getQuestionNumber()).append(","); + } + form6.setScore(score); + form6.setAllRate(allSumScore / new Double(allStudents.size()) / score ); + form6.setAllAvg(allSumScore / new Double(allStudents.size())); + form6.setSchoolRate(schoolSumScore / new Double(students.size()) / score); + form6.setSchoolAvg(schoolSumScore / new Double(students.size())); + form6.setAllDist(new Double(allHigh-allLow) / new Double(allNumber * analyseDimensionals.size())); + form6.setSchoolDist(new Double(high-low) / new Double(number * analyseDimensionals.size())); + form6.setExamNumber(examNumber.toString().substring(0,examNumber.toString().length()-1)); + list.add(form6); + } + return list; + } + } diff --git a/src/main/java/com/jevon/enums/DifficultEnums.java b/src/main/java/com/jevon/enums/DifficultEnums.java index 53551cd..774d8d8 100644 --- a/src/main/java/com/jevon/enums/DifficultEnums.java +++ b/src/main/java/com/jevon/enums/DifficultEnums.java @@ -43,4 +43,13 @@ public enum DifficultEnums { } return 0 ; } + + public static String getDifficultName(int difficultType){ + for (DifficultEnums difficultEnums : DifficultEnums.values()) { + if (difficultEnums.getDifficultType() == difficultType) { + return difficultEnums.getDifficultName(); + } + } + return "" ; + } } diff --git a/src/main/java/com/jevon/mapper/AnalyseDetailMapper.java b/src/main/java/com/jevon/mapper/AnalyseDetailMapper.java index 1198274..a243f28 100644 --- a/src/main/java/com/jevon/mapper/AnalyseDetailMapper.java +++ b/src/main/java/com/jevon/mapper/AnalyseDetailMapper.java @@ -14,4 +14,10 @@ public interface AnalyseDetailMapper { int insertBatch(List list); List selectByAnalyseId(int analyseId); + + Double selectDifficult(AnalyseDetail analyseDetail); + + List selectDifficultDetail(AnalyseDetail analyseDetail); + + List selectQuestionType(int analyseId); } diff --git a/src/main/java/com/jevon/mapper/AnalyseDimensionalMapper.java b/src/main/java/com/jevon/mapper/AnalyseDimensionalMapper.java index ec6b707..fb61601 100644 --- a/src/main/java/com/jevon/mapper/AnalyseDimensionalMapper.java +++ b/src/main/java/com/jevon/mapper/AnalyseDimensionalMapper.java @@ -12,4 +12,6 @@ import java.util.List; public interface AnalyseDimensionalMapper { int insertBatch(List list); + + List selectByDimensional(AnalyseDimensional analyseDimensional); } diff --git a/src/main/java/com/jevon/mapper/DimensionalMapper.java b/src/main/java/com/jevon/mapper/DimensionalMapper.java index f0f80c3..a861984 100644 --- a/src/main/java/com/jevon/mapper/DimensionalMapper.java +++ b/src/main/java/com/jevon/mapper/DimensionalMapper.java @@ -14,4 +14,6 @@ public interface DimensionalMapper { int insert(Dimensional dimensional); List select(Dimensional dimensional); + + List selectByAnalyse(Dimensional dimensional); } diff --git a/src/main/java/com/jevon/model/AnalyseDimensional.java b/src/main/java/com/jevon/model/AnalyseDimensional.java index 769838b..e17986e 100644 --- a/src/main/java/com/jevon/model/AnalyseDimensional.java +++ b/src/main/java/com/jevon/model/AnalyseDimensional.java @@ -13,7 +13,7 @@ public class AnalyseDimensional { private int analyseId ; private String questionNumber ; private int dimensionalId ; - private float score ; + private Double score ; private Date createTime ; public int getId() { @@ -48,11 +48,11 @@ public class AnalyseDimensional { this.dimensionalId = dimensionalId; } - public float getScore() { + public Double getScore() { return score; } - public void setScore(float score) { + public void setScore(Double score) { this.score = score; } @@ -63,4 +63,5 @@ public class AnalyseDimensional { public void setCreateTime(Date createTime) { this.createTime = createTime; } + } diff --git a/src/main/java/com/jevon/model/Dimensional.java b/src/main/java/com/jevon/model/Dimensional.java index ce68412..c670bf6 100644 --- a/src/main/java/com/jevon/model/Dimensional.java +++ b/src/main/java/com/jevon/model/Dimensional.java @@ -13,6 +13,8 @@ public class Dimensional { private int dimensionalType ; private String dimensionalName; private Date createTime ; + //查询用 + private int analyseId ; public int getId() { return id; @@ -45,4 +47,12 @@ public class Dimensional { public void setCreateTime(Date createTime) { this.createTime = createTime; } + + public int getAnalyseId() { + return analyseId; + } + + public void setAnalyseId(int analyseId) { + this.analyseId = analyseId; + } } diff --git a/src/main/java/com/jevon/model/Student.java b/src/main/java/com/jevon/model/Student.java index 5efb79b..daacf8b 100644 --- a/src/main/java/com/jevon/model/Student.java +++ b/src/main/java/com/jevon/model/Student.java @@ -18,7 +18,7 @@ public class Student { private String studentName ; private String studentNumber ; private int analyseId ; - private float score ; + private double score ; private Date createTime ; private double begin ; @@ -29,7 +29,7 @@ public class Student { this.className = scoreExcelVo.getClassName(); this.studentName = scoreExcelVo.getStudentName(); this.studentNumber = scoreExcelVo.getStudentNumber(); - this.score =new Float(scoreExcelVo.getScore()); + this.score = new Double(scoreExcelVo.getScore()); } public Student() { @@ -91,11 +91,11 @@ public class Student { this.analyseId = analyseId; } - public float getScore() { + public double getScore() { return score; } - public void setScore(float score) { + public void setScore(double score) { this.score = score; } diff --git a/src/main/java/com/jevon/model/StudentDetail.java b/src/main/java/com/jevon/model/StudentDetail.java index 1aed6c2..1f0c381 100644 --- a/src/main/java/com/jevon/model/StudentDetail.java +++ b/src/main/java/com/jevon/model/StudentDetail.java @@ -20,7 +20,7 @@ public class StudentDetail { private String studentNumber ; private int analyseId ; private String examNumber ; - private float score ; + private Double score ; private Date createTime ; //查询用 高分段 低分段学生考号 @@ -100,11 +100,11 @@ public class StudentDetail { this.examNumber = examNumber; } - public float getScore() { + public Double getScore() { return score; } - public void setScore(float score) { + public void setScore(Double score) { this.score = score; } diff --git a/src/main/java/com/jevon/service/AnalyseDetailService.java b/src/main/java/com/jevon/service/AnalyseDetailService.java index b963097..fb184ec 100644 --- a/src/main/java/com/jevon/service/AnalyseDetailService.java +++ b/src/main/java/com/jevon/service/AnalyseDetailService.java @@ -15,5 +15,10 @@ public interface AnalyseDetailService { List selectByAnalyseId(int analyseId); + Double selectDifficult(int analyseId , int difficult); + + List selectDifficultDetail(int analyseId , int difficult); + + List selectQuestionType(int analyseId); } diff --git a/src/main/java/com/jevon/service/AnalyseDimensionalService.java b/src/main/java/com/jevon/service/AnalyseDimensionalService.java index 52d7ee1..53c6476 100644 --- a/src/main/java/com/jevon/service/AnalyseDimensionalService.java +++ b/src/main/java/com/jevon/service/AnalyseDimensionalService.java @@ -13,4 +13,6 @@ public interface AnalyseDimensionalService { int insertBatch(List list); + List selectByDimensional(int analyseId ,int dimensionalId); + } diff --git a/src/main/java/com/jevon/service/DimensionalService.java b/src/main/java/com/jevon/service/DimensionalService.java index 36b5e96..879cc9c 100644 --- a/src/main/java/com/jevon/service/DimensionalService.java +++ b/src/main/java/com/jevon/service/DimensionalService.java @@ -16,4 +16,7 @@ public interface DimensionalService { List select(Dimensional dimensional); Dimensional selectByTypeAndName(int type , String name); + + List selectByAnalyse(int analyseId , int dimensionalType); + } diff --git a/src/main/java/com/jevon/service/StudentDetailService.java b/src/main/java/com/jevon/service/StudentDetailService.java index e7e3c7d..cfd7868 100644 --- a/src/main/java/com/jevon/service/StudentDetailService.java +++ b/src/main/java/com/jevon/service/StudentDetailService.java @@ -16,5 +16,4 @@ public interface StudentDetailService { Double selectSumScore(int analyseId , String schoolName , String examNumber); int selectTrueByExamNumber(int analyseId , String schoolName , String examNumber , List studentNumbers ,Double score); - } diff --git a/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java b/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java index d16c0ea..caef638 100644 --- a/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java @@ -40,4 +40,25 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService { public List selectByAnalyseId(int analyseId) { return analyseDetailMapper.selectByAnalyseId(analyseId); } + + @Override + public Double selectDifficult(int analyseId, int difficult) { + AnalyseDetail analyseDetail = new AnalyseDetail(); + analyseDetail.setDifficult(difficult); + analyseDetail.setAnalyseId(analyseId); + return analyseDetailMapper.selectDifficult(analyseDetail); + } + + @Override + public List selectDifficultDetail(int analyseId, int difficult) { + AnalyseDetail analyseDetail = new AnalyseDetail(); + analyseDetail.setDifficult(difficult); + analyseDetail.setAnalyseId(analyseId); + return analyseDetailMapper.selectDifficultDetail(analyseDetail); + } + + @Override + public List selectQuestionType(int analyseId) { + return analyseDetailMapper.selectQuestionType(analyseId); + } } diff --git a/src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java b/src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java index f849d63..8c1f82d 100644 --- a/src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java @@ -35,4 +35,12 @@ public class AnalyseDimensionalServiceImpl implements AnalyseDimensionalService analyseDimensionalMapper.insertBatch(result); return 1 ; } + + @Override + public List selectByDimensional(int analyseId, int dimensionalId) { + AnalyseDimensional analyseDimensional = new AnalyseDimensional(); + analyseDimensional.setAnalyseId(analyseId); + analyseDimensional.setDimensionalId(dimensionalId); + return analyseDimensionalMapper.selectByDimensional(analyseDimensional); + } } diff --git a/src/main/java/com/jevon/service/impl/DimensionalServiceImpl.java b/src/main/java/com/jevon/service/impl/DimensionalServiceImpl.java index 08180fb..c79cbdd 100644 --- a/src/main/java/com/jevon/service/impl/DimensionalServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/DimensionalServiceImpl.java @@ -41,4 +41,12 @@ public class DimensionalServiceImpl implements DimensionalService { } return null; } + + @Override + public List selectByAnalyse(int analyseId, int dimensionalType) { + Dimensional dimensional = new Dimensional(); + dimensional.setDimensionalType(dimensionalType); + dimensional.setAnalyseId(analyseId); + return dimensionalMapper.selectByAnalyse(dimensional); + } } diff --git a/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java b/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java index 6849e8a..df22ddb 100644 --- a/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java @@ -51,7 +51,7 @@ public class StudentDetailServiceImpl implements StudentDetailService { studentDetail.setAnalyseId(analyseId); studentDetail.setSchoolName(schoolName); studentDetail.setExamNumber(examNumber); - studentDetail.setScore(new Float(score)); + studentDetail.setScore(score); studentDetail.setStudentNumbers(studentNumbers); return studentDetailMapper.selectTrueByExamNumber(studentDetail); } diff --git a/src/main/java/com/jevon/wordDTO/second/Form6.java b/src/main/java/com/jevon/wordDTO/second/Form6.java new file mode 100644 index 0000000..f16bf8a --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/second/Form6.java @@ -0,0 +1,91 @@ +package com.jevon.wordDTO.second; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 11:25 + */ +public class Form6 { + private String knowledge ; + private Double score ; + private Double allRate ; + private Double schoolRate ; + private Double allAvg ; + private Double schoolAvg ; + private Double allDist ; + private Double schoolDist ; + + private String examNumber ; + + public String getKnowledge() { + return knowledge; + } + + public void setKnowledge(String knowledge) { + this.knowledge = knowledge; + } + + public Double getScore() { + return score; + } + + public void setScore(Double score) { + this.score = score; + } + + public Double getAllRate() { + return allRate; + } + + public void setAllRate(Double allRate) { + this.allRate = allRate; + } + + public Double getSchoolRate() { + return schoolRate; + } + + public void setSchoolRate(Double schoolRate) { + this.schoolRate = schoolRate; + } + + public Double getAllAvg() { + return allAvg; + } + + public void setAllAvg(Double allAvg) { + this.allAvg = allAvg; + } + + public Double getSchoolAvg() { + return schoolAvg; + } + + public void setSchoolAvg(Double schoolAvg) { + this.schoolAvg = schoolAvg; + } + + public Double getAllDist() { + return allDist; + } + + public void setAllDist(Double allDist) { + this.allDist = allDist; + } + + public Double getSchoolDist() { + return schoolDist; + } + + public void setSchoolDist(Double schoolDist) { + this.schoolDist = schoolDist; + } + + public String getExamNumber() { + return examNumber; + } + + public void setExamNumber(String examNumber) { + this.examNumber = examNumber; + } +} diff --git a/src/main/java/com/jevon/wordDTO/second/Form7.java b/src/main/java/com/jevon/wordDTO/second/Form7.java new file mode 100644 index 0000000..a17f0af --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/second/Form7.java @@ -0,0 +1,28 @@ +package com.jevon.wordDTO.second; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 14:58 + */ +public class Form7 { + + private String name ; + private Double percent ; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Double getPercent() { + return percent; + } + + public void setPercent(Double percent) { + this.percent = percent; + } +} diff --git a/src/main/java/com/jevon/wordDTO/second/Form8.java b/src/main/java/com/jevon/wordDTO/second/Form8.java new file mode 100644 index 0000000..62be0ca --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/second/Form8.java @@ -0,0 +1,46 @@ +package com.jevon.wordDTO.second; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 15:14 + */ +public class Form8 { + + private String difficultName ; + private Double score ; + private Double allRate ; + private Double schoolRate ; + + public String getDifficultName() { + return difficultName; + } + + public void setDifficultName(String difficultName) { + this.difficultName = difficultName; + } + + public Double getScore() { + return score; + } + + public void setScore(Double score) { + this.score = score; + } + + public Double getAllRate() { + return allRate; + } + + public void setAllRate(Double allRate) { + this.allRate = allRate; + } + + public Double getSchoolRate() { + return schoolRate; + } + + public void setSchoolRate(Double schoolRate) { + this.schoolRate = schoolRate; + } +} diff --git a/src/main/java/com/jevon/wordDTO/second/From5.java b/src/main/java/com/jevon/wordDTO/second/From5.java index 00768b6..ea52be1 100644 --- a/src/main/java/com/jevon/wordDTO/second/From5.java +++ b/src/main/java/com/jevon/wordDTO/second/From5.java @@ -8,6 +8,7 @@ package com.jevon.wordDTO.second; public class From5 { private String examNumber ; + private String difficultName ; private Double score ; private Double allRate ; private Double schoolRate ; @@ -79,4 +80,12 @@ public class From5 { public void setSchoolDist(Double schoolDist) { this.schoolDist = schoolDist; } + + public String getDifficultName() { + return difficultName; + } + + public void setDifficultName(String difficultName) { + this.difficultName = difficultName; + } } diff --git a/src/main/resources/mapping/AnalyseDetailMapper.xml b/src/main/resources/mapping/AnalyseDetailMapper.xml index 5ebcc37..fea5781 100644 --- a/src/main/resources/mapping/AnalyseDetailMapper.xml +++ b/src/main/resources/mapping/AnalyseDetailMapper.xml @@ -22,4 +22,17 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapping/AnalyseDimensionalMapper.xml b/src/main/resources/mapping/AnalyseDimensionalMapper.xml index 2dcb01f..8ef40d3 100644 --- a/src/main/resources/mapping/AnalyseDimensionalMapper.xml +++ b/src/main/resources/mapping/AnalyseDimensionalMapper.xml @@ -5,7 +5,7 @@ - + @@ -17,4 +17,9 @@ (#{emp.analyseId},#{emp.questionNumber},#{emp.dimensionalId},#{emp.score},#{emp.createTime}) + + \ No newline at end of file diff --git a/src/main/resources/mapping/AnalyseMapper.xml b/src/main/resources/mapping/AnalyseMapper.xml index e3137c0..94442ff 100644 --- a/src/main/resources/mapping/AnalyseMapper.xml +++ b/src/main/resources/mapping/AnalyseMapper.xml @@ -10,7 +10,7 @@ - + insert into sz_learn_analyse (exam_name, exam_time,course_name,create_time) values (#{examName},#{examTime},#{courseName},#{createTime}) diff --git a/src/main/resources/mapping/DimensionalMapper.xml b/src/main/resources/mapping/DimensionalMapper.xml index aef563f..1a41812 100644 --- a/src/main/resources/mapping/DimensionalMapper.xml +++ b/src/main/resources/mapping/DimensionalMapper.xml @@ -22,4 +22,9 @@ and dimensional_name = #{dimensionalName} + + \ No newline at end of file diff --git a/src/main/resources/mapping/StudentDetailMapper.xml b/src/main/resources/mapping/StudentDetailMapper.xml index 7465312..0e98157 100644 --- a/src/main/resources/mapping/StudentDetailMapper.xml +++ b/src/main/resources/mapping/StudentDetailMapper.xml @@ -53,4 +53,5 @@ #{item} + \ No newline at end of file -- libgit2 0.21.0