diff --git a/src/main/java/com/jevon/controller/LearnController.java b/src/main/java/com/jevon/controller/LearnController.java index 5fc43e0..d882538 100644 --- a/src/main/java/com/jevon/controller/LearnController.java +++ b/src/main/java/com/jevon/controller/LearnController.java @@ -7,9 +7,7 @@ import com.jevon.service.*; import com.jevon.vo.BaseVo; import com.jevon.vo.excel.ExamExcelVo; import com.jevon.vo.excel.ScoreExcelVo; -import com.jevon.vo.req.CreateExamReqVo; -import com.jevon.vo.req.InitAnalyseReqVo; -import com.jevon.vo.req.UpdateExamReqVo; +import com.jevon.vo.req.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -54,6 +52,9 @@ public class LearnController { @Autowired StudentService studentService; + @Autowired + LeagueService leagueService; + @ApiOperation("获取列表") @RequestMapping(value = "getList", method = RequestMethod.POST) public List getList(){ @@ -260,4 +261,34 @@ public class LearnController { System.out.println(e.toString()); } } + + @ApiOperation("获取导入的学校列表") + @RequestMapping(value = "getSchoolName", method = RequestMethod.GET) + public List getSchoolName(int analyseId){ + return studentService.selectSchoolNameByAnalyse(analyseId); + } + + @ApiOperation("定义这次考试的联盟校") + @RequestMapping(value = "initLeague", method = RequestMethod.POST) + public BaseVo initLeague(@RequestBody InitLeagueReqVo initLeagueReqVo){ + BaseVo baseVo = new BaseVo(); + Analyse analyse = analyseService.selectById(initLeagueReqVo.getAnalyseId()); + if(analyse == null){ + baseVo.setMessage("请先创建考试"); + baseVo.setSuccess(false); + return baseVo; + } + List leagues = new ArrayList<>(); + for(InitLeague initLeague : initLeagueReqVo.getData()){ + for(String schoolName : initLeague.getSchoolNames()){ + League league = new League(); + league.setAnalyseId(analyse.getId()); + league.setLeague(initLeague.getLeague()); + league.setSchoolName(schoolName); + leagues.add(league); + } + } + leagueService.insertBatch(leagues); + return baseVo; + } } diff --git a/src/main/java/com/jevon/controller/LearnStatController.java b/src/main/java/com/jevon/controller/LearnStatController.java index b064ad9..54fe9cc 100644 --- a/src/main/java/com/jevon/controller/LearnStatController.java +++ b/src/main/java/com/jevon/controller/LearnStatController.java @@ -5,7 +5,7 @@ import com.jevon.enums.DimensionalEnums; import com.jevon.model.*; import com.jevon.service.*; import com.jevon.vo.req.GetLearnReqVo; -import com.jevon.wordDTO.second.*; +import com.jevon.wordDTO.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +46,9 @@ public class LearnStatController { @Autowired StudentService studentService; + @Autowired + LeagueService leagueService; + @ApiOperation("getForm1_1") @RequestMapping(value = "getForm1_1", method = RequestMethod.POST) public List getForm1_1(@RequestBody GetLearnReqVo getLearnReqVo){ @@ -68,8 +71,8 @@ public class LearnStatController { @ApiOperation("getForm2_1_1") @RequestMapping(value = "getForm2_1_1", method = RequestMethod.POST) - public Form1RepVo getForm2_1_1(@RequestBody GetLearnReqVo getLearnReqVo){ - Form1RepVo form1RepVo = new Form1RepVo(); + public Form1RepVO getForm2_1_1(@RequestBody GetLearnReqVo getLearnReqVo){ + Form1RepVO form1RepVo = new Form1RepVO(); //2.1表 Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); //分数段 @@ -80,12 +83,12 @@ public class LearnStatController { segmentMap.put("C(及格)",maxScore*0.7 + "~" + (maxScore*0.7-1f)+"分"); segmentMap.put("D(不及格)",0 + "~" + (maxScore*0.6-1f)+"分"); form1RepVo.setMap(segmentMap); - List students = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName()); + List students = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName()); double sum = new Double(students.size()); - int a = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName(),maxScore*0.85,maxScore+1f); - int b = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName(),maxScore*0.7,(maxScore*0.85)); - int c = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName(),maxScore*0.6,(maxScore*0.7)); - int d = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName(),maxScore*0,(maxScore*0.6)); + int a = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName(),maxScore*0.85,maxScore+1f); + int b = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName(),maxScore*0.7,(maxScore*0.85)); + int c = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName(),maxScore*0.6,(maxScore*0.7)); + int d = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName(),maxScore*0,(maxScore*0.6)); List form1List = new ArrayList<>(); Form1 formA = new Form1(); formA.setLevel("A"); @@ -113,52 +116,89 @@ public class LearnStatController { @ApiOperation("getForm2_1_2") @RequestMapping(value = "getForm2_1_2", method = RequestMethod.POST) - public List getForm2_1_2(@RequestBody GetLearnReqVo getLearnReqVo){ + public Form2RepVO getForm2_1_2(@RequestBody GetLearnReqVo getLearnReqVo){ + Form2RepVO repVO = new Form2RepVO(); Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); - List allStudents = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),null); - List students = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName()); + if(analyse == null){ + repVO.setSuccess(false); + repVO.setMessage("请先创建考试"); + return repVO; + } + List leagues = leagueService.getLeagueBySchoolName(analyse.getId(),getLearnReqVo.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定区"); + return repVO; + } + List allStudents = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),null,null); + List leagueStudents = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),leagues,null); + List students = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName()); //先算高分段的分数 int highNumber = (int) Math.floor(allStudents.size()*0.27); double highScore = allStudents.get(highNumber).getScore(); int lowNumber = allStudents.size()-highNumber; double lowScore = allStudents.get(lowNumber).getScore(); - int highAllCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,highScore,analyse.getMaxScore()+1f); - int lowAllCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,0,lowScore); - int highCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName(),highScore,analyse.getMaxScore()+1f); - int lowCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName(),0,lowScore); List list = new ArrayList<>(); - Form2 form = new Form2(); - form.setName("联盟校"); - form.setStudentNumber(allStudents.size()); - form.setHighNumber(highAllCount); - form.setLowNumber(lowAllCount); - list.add(form); + + int highAllCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,null,highScore,analyse.getMaxScore()+1f); + int lowAllCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,null,0,lowScore); Form2 form2 = new Form2(); - form2.setName(getLearnReqVo.getSchoolName()); - form2.setStudentNumber(students.size()); - form2.setHighNumber(highCount); - form2.setLowNumber(lowCount); - form2.setHighProp(highCount/new Double(highAllCount)); - form2.setLowProp(lowCount/new Double(lowAllCount)); + form2.setName("区"); + form2.setStudentNumber(allStudents.size()); + form2.setHighNumber(highAllCount); + form2.setLowNumber(lowAllCount); list.add(form2); - return list; + { + int highLeagueCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),leagues,null,highScore,analyse.getMaxScore()+1f); + int lowLeagueCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),leagues,null,0,lowScore); + Form2 form = new Form2(); + form.setName("联盟校"); + form.setStudentNumber(leagueStudents.size()); + form.setStudentProp(new Double(leagueStudents.size()) / new Double(allStudents.size())); + form.setHighNumber(highLeagueCount); + form.setLowNumber(lowLeagueCount); + form.setHighProp(highLeagueCount/new Double(highAllCount)); + form.setLowProp(lowLeagueCount/new Double(lowAllCount)); + list.add(form); + } + { + int highCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName(),highScore,analyse.getMaxScore()+1f); + int lowCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName(),0,lowScore); + Form2 form = new Form2(); + form.setName(getLearnReqVo.getSchoolName()); + form.setStudentNumber(students.size()); + form.setStudentProp(new Double(students.size()) / new Double(allStudents.size())); + form.setHighNumber(highCount); + form.setLowNumber(lowCount); + form.setHighProp(highCount/new Double(highAllCount)); + form.setLowProp(lowCount/new Double(lowAllCount)); + list.add(form); + } + repVO.setData(list); + return repVO; } @ApiOperation("getForm2_1_3_2") @RequestMapping(value = "getForm2_1_3_2", method = RequestMethod.POST) - public List getForm2_1_3_2(@RequestBody GetLearnReqVo getLearnReqVo){ + public Form2RepVO getForm2_1_3_2(@RequestBody GetLearnReqVo getLearnReqVo){ + Form2RepVO repVO = new Form2RepVO(); Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); - List allStudents = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName()); - //先算高分段的分数 再去人数 + if(analyse == null){ + repVO.setSuccess(false); + repVO.setMessage("请先创建考试"); + return repVO; + } + List allStudents = studentService.selectBySchoolName(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName()); + //先算高分段的分数 int highNumber = (int) Math.floor(allStudents.size()*0.27); double highScore = allStudents.get(highNumber).getScore(); int lowNumber = allStudents.size()-highNumber; double lowScore = allStudents.get(lowNumber).getScore(); - int highAllCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName(),highScore,analyse.getMaxScore()+1f); - int lowAllCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName(),0,lowScore); + int highAllCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName(),highScore,analyse.getMaxScore()+1f); + int lowAllCount = studentService.selectCountByScore(getLearnReqVo.getAnalyseId(),null,getLearnReqVo.getSchoolName(),0,lowScore); List resultList = new ArrayList<>(); Form2 form = new Form2(); - form.setName("联盟校"); + form.setName(getLearnReqVo.getSchoolName()); form.setStudentNumber(allStudents.size()); form.setHighNumber(highAllCount); form.setLowNumber(lowAllCount); @@ -171,13 +211,15 @@ public class LearnStatController { Form2 form2 = new Form2(); form2.setName(className); form2.setStudentNumber(list.size()); + form2.setStudentProp(new Double(list.size()) / new Double(allStudents.size())); form2.setHighNumber(highCount); form2.setLowNumber(lowCount); form2.setHighProp(highCount/new Double(highAllCount)); form2.setLowProp(lowCount/new Double(lowAllCount)); resultList.add(form2); } - return resultList; + repVO.setData(resultList); + return repVO; } @ApiOperation("getForm2_1_3") @@ -206,10 +248,10 @@ public class LearnStatController { Table1 table1 = new Table1(); if(i == 0){ table1.setScore(list.get(i)+""); - table1.setNumber(studentService.selectCountByScore(analyse.getId(),getLearnReqVo.getSchoolName(),new Double(list.get(i)),new Double(list.get(i)+1))); + table1.setNumber(studentService.selectCountByScore(analyse.getId(),null,getLearnReqVo.getSchoolName(),new Double(list.get(i)),new Double(list.get(i)+1))); }else { table1.setScore(list.get(i)+"-"+(list.get(i-1)-0.5)); - table1.setNumber(studentService.selectCountByScore(analyse.getId(),getLearnReqVo.getSchoolName(),new Double(list.get(i)),new Double(list.get(i-1)))); + table1.setNumber(studentService.selectCountByScore(analyse.getId(),null,getLearnReqVo.getSchoolName(),new Double(list.get(i)),new Double(list.get(i-1)))); } list1.add(table1); } @@ -218,216 +260,378 @@ public class LearnStatController { @ApiOperation("getForm2_2_1") @RequestMapping(value = "getForm2_2_1", method = RequestMethod.POST) - public List getForm2_2_1(@RequestBody GetLearnReqVo getLearnReqVo){ + public Form3RepVO getForm2_2_1(@RequestBody GetLearnReqVo getLearnReqVo){ + Form3RepVO repVO = new Form3RepVO(); Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); + if(analyse == null){ + repVO.setSuccess(false); + repVO.setMessage("请先创建考试"); + return repVO; + } + List leagues = leagueService.getLeagueBySchoolName(analyse.getId(),getLearnReqVo.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定区"); + return repVO; + } List list = new ArrayList<>(); - Form3 form3 = new Form3(); - form3.setName("联盟校"); - List allStudents = studentService.selectBySchoolName(analyse.getId(),null); - form3.setMaxScore(studentService.selectMaxScore(analyse.getId(),null)); - form3.setAverage(studentService.selectAvgScore(analyse.getId(),null)); - form3.setMinScore(studentService.selectMinScore(analyse.getId(),null)); - int a = studentService.selectCountByScore(analyse.getId(),null,analyse.getMaxScore()*0.85,analyse.getMaxScore()+1); - form3.setApercent(a / new Double(allStudents.size()) * 100); - int b = studentService.selectCountByScore(analyse.getId(),null,analyse.getMaxScore()*0.7,analyse.getMaxScore()*0.85); - form3.setBpercent(b / new Double(allStudents.size()) * 100); - int c = studentService.selectCountByScore(analyse.getId(),null,analyse.getMaxScore()*0.6,analyse.getMaxScore()*0.7); - form3.setCpercent(c / new Double(allStudents.size()) * 100); - int d = studentService.selectCountByScore(analyse.getId(),null,analyse.getMaxScore()*0,analyse.getMaxScore()*0.6); - form3.setDpercent(d / new Double(allStudents.size()) * 100); - list.add(form3); - - Form3 form = new Form3(); - form.setName("联盟校"); - List students = studentService.selectBySchoolName(analyse.getId(),getLearnReqVo.getSchoolName()); - form.setMaxScore(studentService.selectMaxScore(analyse.getId(),getLearnReqVo.getSchoolName())); - form.setAverage(studentService.selectAvgScore(analyse.getId(),getLearnReqVo.getSchoolName())); - form.setMinScore(studentService.selectMinScore(analyse.getId(),getLearnReqVo.getSchoolName())); - int a1 = studentService.selectCountByScore(analyse.getId(),getLearnReqVo.getSchoolName(),analyse.getMaxScore()*0.85,analyse.getMaxScore()+1); - form.setApercent(a1 / new Double(students.size()) * 100); - int b1 = studentService.selectCountByScore(analyse.getId(),getLearnReqVo.getSchoolName(),analyse.getMaxScore()*0.7,analyse.getMaxScore()*0.85); - form.setBpercent(b1 / new Double(students.size()) * 100); - int c1 = studentService.selectCountByScore(analyse.getId(),getLearnReqVo.getSchoolName(),analyse.getMaxScore()*0.6,analyse.getMaxScore()*0.7); - form.setCpercent(c1 / new Double(students.size()) * 100); - int d1 = studentService.selectCountByScore(analyse.getId(),getLearnReqVo.getSchoolName(),analyse.getMaxScore()*0,analyse.getMaxScore()*0.6); - form.setDpercent(d1 / new Double(students.size()) * 100); - list.add(form); - return list ; + List allStudents = studentService.selectBySchoolName(analyse.getId(),null,null); + { + Form3 form3 = new Form3(); + form3.setName("区"); + form3.setMaxScore(studentService.selectMaxScore(analyse.getId(),null,null)); + form3.setAverage(studentService.selectAvgScore(analyse.getId(),null,null)); + form3.setMinScore(studentService.selectMinScore(analyse.getId(),null,null)); + int a = studentService.selectCountByScore(analyse.getId(),null,null,analyse.getMaxScore()*0.85,analyse.getMaxScore()+1); + form3.setApercent(a / new Double(allStudents.size()) * 100); + int b = studentService.selectCountByScore(analyse.getId(),null,null,analyse.getMaxScore()*0.7,analyse.getMaxScore()*0.85); + form3.setBpercent(b / new Double(allStudents.size()) * 100); + int c = studentService.selectCountByScore(analyse.getId(),null,null,analyse.getMaxScore()*0.6,analyse.getMaxScore()*0.7); + form3.setCpercent(c / new Double(allStudents.size()) * 100); + int d = studentService.selectCountByScore(analyse.getId(),null,null,analyse.getMaxScore()*0,analyse.getMaxScore()*0.6); + form3.setDpercent(d / new Double(allStudents.size()) * 100); + list.add(form3); + } + { + Form3 form = new Form3(); + form.setName("联盟校"); + List students = studentService.selectBySchoolName(analyse.getId(),leagues,null); + form.setMaxScore(studentService.selectMaxScore(analyse.getId(),leagues,null)); + form.setAverage(studentService.selectAvgScore(analyse.getId(),leagues,null)); + form.setMinScore(studentService.selectMinScore(analyse.getId(),leagues,null)); + int a1 = studentService.selectCountByScore(analyse.getId(),leagues,null,analyse.getMaxScore()*0.85,analyse.getMaxScore()+1); + form.setApercent(a1 / new Double(students.size()) * 100); + int b1 = studentService.selectCountByScore(analyse.getId(),leagues,null,analyse.getMaxScore()*0.7,analyse.getMaxScore()*0.85); + form.setBpercent(b1 / new Double(students.size()) * 100); + int c1 = studentService.selectCountByScore(analyse.getId(),leagues,null,analyse.getMaxScore()*0.6,analyse.getMaxScore()*0.7); + form.setCpercent(c1 / new Double(students.size()) * 100); + int d1 = studentService.selectCountByScore(analyse.getId(),leagues,null,analyse.getMaxScore()*0,analyse.getMaxScore()*0.6); + form.setDpercent(d1 / new Double(students.size()) * 100); + list.add(form); + } + { + Form3 form = new Form3(); + form.setName(getLearnReqVo.getSchoolName()); + List students = studentService.selectBySchoolName(analyse.getId(),null,getLearnReqVo.getSchoolName()); + form.setMaxScore(studentService.selectMaxScore(analyse.getId(),null,getLearnReqVo.getSchoolName())); + form.setAverage(studentService.selectAvgScore(analyse.getId(),null,getLearnReqVo.getSchoolName())); + form.setMinScore(studentService.selectMinScore(analyse.getId(),null,getLearnReqVo.getSchoolName())); + int a1 = studentService.selectCountByScore(analyse.getId(),null,getLearnReqVo.getSchoolName(),analyse.getMaxScore()*0.85,analyse.getMaxScore()+1); + form.setApercent(a1 / new Double(students.size()) * 100); + int b1 = studentService.selectCountByScore(analyse.getId(),null,getLearnReqVo.getSchoolName(),analyse.getMaxScore()*0.7,analyse.getMaxScore()*0.85); + form.setBpercent(b1 / new Double(students.size()) * 100); + int c1 = studentService.selectCountByScore(analyse.getId(),null,getLearnReqVo.getSchoolName(),analyse.getMaxScore()*0.6,analyse.getMaxScore()*0.7); + form.setCpercent(c1 / new Double(students.size()) * 100); + int d1 = studentService.selectCountByScore(analyse.getId(),null,getLearnReqVo.getSchoolName(),analyse.getMaxScore()*0,analyse.getMaxScore()*0.6); + form.setDpercent(d1 / new Double(students.size()) * 100); + list.add(form); + } + repVO.setData(list); + return repVO ; } @ApiOperation("getForm2_2_2") @RequestMapping(value = "getForm2_2_2", method = RequestMethod.POST) - public List getForm2_2_2(@RequestBody GetLearnReqVo getLearnReqVo){ + public Form4RepVO getForm2_2_2(@RequestBody GetLearnReqVo getLearnReqVo){ + Form4RepVO repVO = new Form4RepVO(); Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); + if(analyse == null){ + repVO.setSuccess(false); + repVO.setMessage("请先创建考试"); + return repVO; + } + List leagues = leagueService.getLeagueBySchoolName(analyse.getId(),getLearnReqVo.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定区"); + return repVO; + } List list = new ArrayList<>(); - Form4 form4 = new Form4(); - form4.setName("联盟校"); - form4.setModeNumber(studentService.selectModeNumber(analyse.getId(),null)); - form4.setMedianNumber(studentService.selectMedian(analyse.getId(),null)); - form4.setStdev(studentService.selectStdev(analyse.getId(),null)); - form4.setAvgNumber(studentService.selectAvgScore(analyse.getId(),null)); - list.add(form4); - Form4 form = new Form4(); - form.setName(getLearnReqVo.getSchoolName()); - form.setModeNumber(studentService.selectModeNumber(analyse.getId(),getLearnReqVo.getSchoolName())); - form.setMedianNumber(studentService.selectMedian(analyse.getId(),getLearnReqVo.getSchoolName())); - form.setStdev(studentService.selectStdev(analyse.getId(),getLearnReqVo.getSchoolName())); - form.setAvgNumber(studentService.selectAvgScore(analyse.getId(),getLearnReqVo.getSchoolName())); - list.add(form); - return list; + { + Form4 form4 = new Form4(); + form4.setName("区"); + form4.setModeNumber(studentService.selectModeNumber(analyse.getId(),null,null)); + form4.setMedianNumber(studentService.selectMedian(analyse.getId(),null,null)); + form4.setStdev(studentService.selectStdev(analyse.getId(),null,null)); + form4.setAvgNumber(studentService.selectAvgScore(analyse.getId(),null,null)); + list.add(form4); + } + { + Form4 form = new Form4(); + form.setName(getLearnReqVo.getSchoolName()); + form.setModeNumber(studentService.selectModeNumber(analyse.getId(),leagues,null)); + form.setMedianNumber(studentService.selectMedian(analyse.getId(),leagues,null)); + form.setStdev(studentService.selectStdev(analyse.getId(),leagues,null)); + form.setAvgNumber(studentService.selectAvgScore(analyse.getId(),leagues,null)); + list.add(form); + } + { + Form4 form = new Form4(); + form.setName(getLearnReqVo.getSchoolName()); + form.setModeNumber(studentService.selectModeNumber(analyse.getId(),null,getLearnReqVo.getSchoolName())); + form.setMedianNumber(studentService.selectMedian(analyse.getId(),null,getLearnReqVo.getSchoolName())); + form.setStdev(studentService.selectStdev(analyse.getId(),null,getLearnReqVo.getSchoolName())); + form.setAvgNumber(studentService.selectAvgScore(analyse.getId(),null,getLearnReqVo.getSchoolName())); + list.add(form); + } + repVO.setData(list); + return repVO; } @ApiOperation("getForm2_2_3") @RequestMapping(value = "getForm2_2_3", method = RequestMethod.POST) - public List getForm2_2_3(@RequestBody GetLearnReqVo getLearnReqVo){ - List list = new ArrayList<>(); + public Form5RepVO getForm2_2_3(@RequestBody GetLearnReqVo getLearnReqVo){ + Form5RepVO repVO = new Form5RepVO(); Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); - List allStudents = studentService.selectBySchoolName(analyse.getId(),null); - int allNumber = (int) Math.floor(allStudents.size()*0.27) ; + if(analyse == null){ + repVO.setSuccess(false); + repVO.setMessage("请先创建考试"); + return repVO; + } + List leagues = leagueService.getLeagueBySchoolName(analyse.getId(),getLearnReqVo.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定区"); + return repVO; + } List allHighStudent = new ArrayList<>(); List allLowStudent = new ArrayList<>(); - for (int i = 0; i < allNumber ; i++) { - allHighStudent.add(allStudents.get(i).getStudentNumber()); + List allStudents = studentService.selectBySchoolName(analyse.getId(),null,null); + int allNumber = (int) Math.floor(allStudents.size()*0.27) ; + { + //获取区 高分段，低分段学生编号 + 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()); + } } - for(int i =allStudents.size()-allNumber ; i < allStudents.size() ; i++){ - allLowStudent.add(allStudents.get(i).getStudentNumber()); + List leagueHighStudent = new ArrayList<>(); + List leagueLowStudent = new ArrayList<>(); + List leagueStudents = studentService.selectBySchoolName(analyse.getId(),leagues,null); + int leagueNumber = (int) Math.floor(leagueStudents.size()*0.27) ; + { + //获取联盟校 高分段 低分段 学生编号 + for (int i = 0; i < leagueNumber ; i++) { + leagueHighStudent.add(leagueStudents.get(i).getStudentNumber()); + } + for(int i =leagueStudents.size()-leagueNumber ; i < leagueStudents.size() ; i++){ + leagueLowStudent.add(leagueStudents.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 students = studentService.selectBySchoolName(analyse.getId(),null,getLearnReqVo.getSchoolName()); + int number = (int) Math.floor(students.size()*0.27) ; + { + //获取本校高分段 低分段 学生编号 + 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 list = new ArrayList<>(); + List analyseDetails = analyseDetailService.selectByAnalyseId(analyse.getId()); for(AnalyseDetail analyseDetail : analyseDetails){ - From5 from5 = new From5(); - Double allSumScore = studentDetailService.selectSumScore(analyse.getId(),null,analyseDetail.getQuestionNumber()); - Double schoolSumScore = studentDetailService.selectSumScore(analyse.getId(),getLearnReqVo.getSchoolName(),analyseDetail.getQuestionNumber()); + Form5 from5 = new Form5(); + Double allSumScore = studentDetailService.selectSumScore(analyse.getId(),null,null,analyseDetail.getQuestionNumber()); + Double leagueSumScore = studentDetailService.selectSumScore(analyse.getId(),leagues,null,analyseDetail.getQuestionNumber()); + Double schoolSumScore = studentDetailService.selectSumScore(analyse.getId(),null,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.setLeagueRate(leagueSumScore/new Double(leagueStudents.size()) / analyseDetail.getScore()); from5.setSchoolRate(schoolSumScore/new Double(students.size()) / analyseDetail.getScore()); + from5.setAllAvg(allSumScore / new Double(allStudents.size())); + from5.setLeagueAvg(leagueSumScore / new Double(leagueStudents.size())); from5.setSchoolAvg(schoolSumScore / new Double(students.size())); - int allHigh = studentDetailService.selectTrueByExamNumber(analyse.getId(),null ,analyseDetail.getQuestionNumber(),allHighStudent,analyseDetail.getScore()); - int allLow = studentDetailService.selectTrueByExamNumber(analyse.getId(),null ,analyseDetail.getQuestionNumber(),allLowStudent,analyseDetail.getScore()); - int high = studentDetailService.selectTrueByExamNumber(analyse.getId(),getLearnReqVo.getSchoolName() ,analyseDetail.getQuestionNumber(),highStudent,analyseDetail.getScore()); - int low = studentDetailService.selectTrueByExamNumber(analyse.getId(),getLearnReqVo.getSchoolName() ,analyseDetail.getQuestionNumber(),lowStudent,analyseDetail.getScore()); + + int allHigh = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,null ,analyseDetail.getQuestionNumber(),allHighStudent,analyseDetail.getScore()); + int allLow = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,null ,analyseDetail.getQuestionNumber(),allLowStudent,analyseDetail.getScore()); + + int leagueHigh = studentDetailService.selectTrueByExamNumber(analyse.getId(),leagues,null ,analyseDetail.getQuestionNumber(),allHighStudent,analyseDetail.getScore()); + int leagueLow = studentDetailService.selectTrueByExamNumber(analyse.getId(),leagues,null ,analyseDetail.getQuestionNumber(),allLowStudent,analyseDetail.getScore()); + + int high = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,getLearnReqVo.getSchoolName() ,analyseDetail.getQuestionNumber(),highStudent,analyseDetail.getScore()); + int low = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,getLearnReqVo.getSchoolName() ,analyseDetail.getQuestionNumber(),lowStudent,analyseDetail.getScore()); from5.setAllDist(new Double(allHigh-allLow)/new Double(allNumber)); + from5.setLeagueDist(new Double(leagueHigh-leagueLow)/new Double(leagueNumber)); from5.setSchoolDist(new Double(high-low)/new Double(number)); list.add(from5); } - return list; + repVO.setData(list); + return repVO; } @ApiOperation("getForm2_2_4") @RequestMapping(value = "getForm2_2_4", method = RequestMethod.POST) - public List getForm2_2_4(@RequestBody GetLearnReqVo getLearnReqVo){ + public Form8RepVO getForm2_2_4(@RequestBody GetLearnReqVo getLearnReqVo){ + Form8RepVO repVO = new Form8RepVO(); Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); + if(analyse == null){ + repVO.setSuccess(false); + repVO.setMessage("请先创建考试"); + return repVO; + } + List leagues = leagueService.getLeagueBySchoolName(analyse.getId(),getLearnReqVo.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定区"); + return repVO; + } List list = new ArrayList<>(); - List allStudents = studentService.selectBySchoolName(analyse.getId(),null); - List students = studentService.selectBySchoolName(analyse.getId(),getLearnReqVo.getSchoolName()); + List allStudents = studentService.selectBySchoolName(analyse.getId(),null,null); + List leagueStudents = studentService.selectBySchoolName(analyse.getId(),leagues,null); + List students = studentService.selectBySchoolName(analyse.getId(),null,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; + Double allSumScore = 0d , leagueSumScore = 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()); + allSumScore = allSumScore + studentDetailService.selectSumScore(analyse.getId(),null,null,analyseDetail.getQuestionNumber()); + leagueSumScore = leagueSumScore + studentDetailService.selectSumScore(analyse.getId(),leagues,null,analyseDetail.getQuestionNumber()); + schoolSumScore = schoolSumScore + studentDetailService.selectSumScore(analyse.getId(),null,getLearnReqVo.getSchoolName(),analyseDetail.getQuestionNumber()); score = score + analyseDetail.getScore() ; } form8.setAllRate(allSumScore / new Double(allStudents.size()) / score ); + form8.setLeagueRate(leagueSumScore / new Double(leagueStudents.size()) / score ); form8.setSchoolRate(schoolSumScore / new Double(students.size()) / score); list.add(form8); } - return list; + repVO.setData(list); + return repVO; } @ApiOperation("getForm3_1") @RequestMapping(value = "getForm3_1", method = RequestMethod.POST) - public List getForm3_1(@RequestBody GetLearnReqVo getLearnReqVo){ + public Form6RepVo 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){ + public Form6RepVo 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){ + public Form6RepVo 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){ + public Form6RepVo getForm3_4(@RequestBody GetLearnReqVo getLearnReqVo){ return initDimensional(getLearnReqVo,DimensionalEnums.think.getDimensionalType()); } - private List initDimensional(GetLearnReqVo getLearnReqVo , int dimensionalType){ - List list = new ArrayList<>(); + private Form6RepVo initDimensional(GetLearnReqVo getLearnReqVo , int dimensionalType){ + Form6RepVo repVO = new Form6RepVo(); Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); - List allStudents = studentService.selectBySchoolName(analyse.getId(),null); - int allNumber = (int) Math.floor(allStudents.size()*0.27) ; + if(analyse == null){ + repVO.setSuccess(false); + repVO.setMessage("请先创建考试"); + return repVO; + } + List leagues = leagueService.getLeagueBySchoolName(analyse.getId(),getLearnReqVo.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定区"); + return repVO; + } List allHighStudent = new ArrayList<>(); List allLowStudent = new ArrayList<>(); - for (int i = 0; i < allNumber ; i++) { - allHighStudent.add(allStudents.get(i).getStudentNumber()); + List allStudents = studentService.selectBySchoolName(analyse.getId(),null,null); + int allNumber = (int) Math.floor(allStudents.size()*0.27) ; + { + //获取区 高分段，低分段学生编号 + 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()); + } } - for(int i =allStudents.size()-allNumber ; i < allStudents.size() ; i++){ - allLowStudent.add(allStudents.get(i).getStudentNumber()); + List leagueHighStudent = new ArrayList<>(); + List leagueLowStudent = new ArrayList<>(); + List leagueStudents = studentService.selectBySchoolName(analyse.getId(),leagues,null); + int leagueNumber = (int) Math.floor(leagueStudents.size()*0.27) ; + { + //获取联盟校 高分段 低分段 学生编号 + for (int i = 0; i < leagueNumber ; i++) { + leagueHighStudent.add(leagueStudents.get(i).getStudentNumber()); + } + for(int i =leagueStudents.size()-leagueNumber ; i < leagueStudents.size() ; i++){ + leagueLowStudent.add(leagueStudents.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 students = studentService.selectBySchoolName(analyse.getId(),null,getLearnReqVo.getSchoolName()); + int number = (int) Math.floor(students.size()*0.27) ; + { + //获取本校高分段 低分段 学生编号 + 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 list = new ArrayList<>(); + List knowledgeList = dimensionalService.selectByAnalyse(analyse.getId(),dimensionalType); for(Dimensional dimensional : knowledgeList){ Form6 form6 = new Form6(); - form6.setKnowledge(dimensional.getDimensionalName()); + form6.setDimensional(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 ; + Double allSumScore = 0d , leagueSumScore = 0d , schoolSumScore = 0d ; + int allHigh = 0 , allLow = 0 , leagueHigh = 0 , leagueLow = 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()); + allSumScore = allSumScore + studentDetailService.selectSumScore(analyse.getId(),null,null,analyseDimensional.getQuestionNumber()); + allHigh = allHigh + studentDetailService.selectTrueByExamNumber(analyse.getId(),null,null ,analyseDimensional.getQuestionNumber(),allHighStudent,analyseDimensional.getScore()); + allLow = allLow + studentDetailService.selectTrueByExamNumber(analyse.getId(),null,null ,analyseDimensional.getQuestionNumber(),allLowStudent,analyseDimensional.getScore()); + + leagueSumScore = leagueSumScore + studentDetailService.selectSumScore(analyse.getId(),leagues,null,analyseDimensional.getQuestionNumber()); + leagueHigh = leagueHigh + studentDetailService.selectTrueByExamNumber(analyse.getId(),leagues,null ,analyseDimensional.getQuestionNumber(),allHighStudent,analyseDimensional.getScore()); + leagueLow = leagueLow + studentDetailService.selectTrueByExamNumber(analyse.getId(),leagues,null ,analyseDimensional.getQuestionNumber(),allLowStudent,analyseDimensional.getScore()); + + schoolSumScore = schoolSumScore + studentDetailService.selectSumScore(analyse.getId(),null,getLearnReqVo.getSchoolName(),analyseDimensional.getQuestionNumber()); + high = high + studentDetailService.selectTrueByExamNumber(analyse.getId(),null,getLearnReqVo.getSchoolName() ,analyseDimensional.getQuestionNumber(),highStudent,analyseDimensional.getScore()); + low = low + studentDetailService.selectTrueByExamNumber(analyse.getId(),null,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.setLeagueRate(leagueSumScore / new Double(leagueStudents.size()) / score ); form6.setSchoolRate(schoolSumScore / new Double(students.size()) / score); + + form6.setAllAvg(allSumScore / new Double(allStudents.size())); + form6.setLeagueAvg(leagueSumScore / new Double(leagueStudents.size())); form6.setSchoolAvg(schoolSumScore / new Double(students.size())); + form6.setAllDist(new Double(allHigh-allLow) / new Double(allNumber * analyseDimensionals.size())); + form6.setLeagueDist(new Double(leagueHigh-leagueLow) / new Double(leagueNumber * 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; + repVO.setData(list); + return repVO; } } diff --git a/src/main/java/com/jevon/mapper/LeagueMapper.java b/src/main/java/com/jevon/mapper/LeagueMapper.java new file mode 100644 index 0000000..2170e53 --- /dev/null +++ b/src/main/java/com/jevon/mapper/LeagueMapper.java @@ -0,0 +1,17 @@ +package com.jevon.mapper; + +import com.jevon.model.League; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 8:59 + */ +public interface LeagueMapper { + + int insertBatch(List list); + + List selectByLeague(League league); +} diff --git a/src/main/java/com/jevon/mapper/StudentMapper.java b/src/main/java/com/jevon/mapper/StudentMapper.java index e18e635..9ec4749 100644 --- a/src/main/java/com/jevon/mapper/StudentMapper.java +++ b/src/main/java/com/jevon/mapper/StudentMapper.java @@ -19,6 +19,8 @@ public interface StudentMapper { List selectClassNameBySchool(Student student); + List selectSchoolNameByAnalyse(int analyseId); + //最高分 Double selectMaxScore(Student student); //最低分 @@ -26,7 +28,7 @@ public interface StudentMapper { //平均分 Double selectAvgScore(Student student); //众数 - Double selectModeNumber(Student student); + List selectModeNumber(Student student); //中位数 Double selectMedian(Student student); //标准差 diff --git a/src/main/java/com/jevon/model/League.java b/src/main/java/com/jevon/model/League.java new file mode 100644 index 0000000..97ffb9d --- /dev/null +++ b/src/main/java/com/jevon/model/League.java @@ -0,0 +1,46 @@ +package com.jevon.model; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 8:59 + */ +public class League { + + private int id ; + private int analyseId ; + private String league ; + private String schoolName ; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getAnalyseId() { + return analyseId; + } + + public void setAnalyseId(int analyseId) { + this.analyseId = analyseId; + } + + public String getLeague() { + return league; + } + + public void setLeague(String league) { + this.league = league; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } +} diff --git a/src/main/java/com/jevon/model/Student.java b/src/main/java/com/jevon/model/Student.java index daacf8b..58865d3 100644 --- a/src/main/java/com/jevon/model/Student.java +++ b/src/main/java/com/jevon/model/Student.java @@ -3,6 +3,7 @@ package com.jevon.model; import com.jevon.vo.excel.ScoreExcelVo; import java.util.Date; +import java.util.List; /** * @author chen @@ -23,6 +24,7 @@ public class Student { private double begin ; private double end ; + private List schoolNames ; public Student(ScoreExcelVo scoreExcelVo) { this.schoolName = scoreExcelVo.getSchoolName(); @@ -122,4 +124,12 @@ public class Student { public void setEnd(double end) { this.end = end; } + + public List getSchoolNames() { + return schoolNames; + } + + public void setSchoolNames(List schoolNames) { + this.schoolNames = schoolNames; + } } diff --git a/src/main/java/com/jevon/model/StudentDetail.java b/src/main/java/com/jevon/model/StudentDetail.java index 1f0c381..e7c0538 100644 --- a/src/main/java/com/jevon/model/StudentDetail.java +++ b/src/main/java/com/jevon/model/StudentDetail.java @@ -12,7 +12,7 @@ import java.util.List; */ public class StudentDetail { - private int id ; + private long id ; private int openId; private String schoolName ; private String className ; @@ -25,6 +25,7 @@ public class StudentDetail { //查询用 高分段 低分段学生考号 private List studentNumbers ; + private List schoolNames ; public StudentDetail(ScoreExcelVo scoreExcelVo) { this.schoolName = scoreExcelVo.getSchoolName(); @@ -36,11 +37,11 @@ public class StudentDetail { public StudentDetail() { } - public int getId() { + public long getId() { return id; } - public void setId(int id) { + public void setId(long id) { this.id = id; } @@ -123,4 +124,12 @@ public class StudentDetail { public void setStudentNumbers(List studentNumbers) { this.studentNumbers = studentNumbers; } + + public List getSchoolNames() { + return schoolNames; + } + + public void setSchoolNames(List schoolNames) { + this.schoolNames = schoolNames; + } } diff --git a/src/main/java/com/jevon/service/LeagueService.java b/src/main/java/com/jevon/service/LeagueService.java new file mode 100644 index 0000000..3baf166 --- /dev/null +++ b/src/main/java/com/jevon/service/LeagueService.java @@ -0,0 +1,20 @@ +package com.jevon.service; + +import com.jevon.model.League; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 9:08 + */ +public interface LeagueService { + + int insertBatch(List list); + + List selectByAnalyseId(int analyseId); + + List getLeagueBySchoolName(int analyseId , String schoolName); + +} diff --git a/src/main/java/com/jevon/service/StudentDetailService.java b/src/main/java/com/jevon/service/StudentDetailService.java index cfd7868..6829947 100644 --- a/src/main/java/com/jevon/service/StudentDetailService.java +++ b/src/main/java/com/jevon/service/StudentDetailService.java @@ -13,7 +13,7 @@ public interface StudentDetailService { int insertBatch(List list); - Double selectSumScore(int analyseId , String schoolName , String examNumber); + Double selectSumScore(int analyseId, List league , String schoolName, String examNumber); - int selectTrueByExamNumber(int analyseId , String schoolName , String examNumber , List studentNumbers ,Double score); + int selectTrueByExamNumber(int analyseId , List league , String schoolName , String examNumber , List studentNumbers ,Double score); } diff --git a/src/main/java/com/jevon/service/StudentService.java b/src/main/java/com/jevon/service/StudentService.java index dd8eb6c..3f040e3 100644 --- a/src/main/java/com/jevon/service/StudentService.java +++ b/src/main/java/com/jevon/service/StudentService.java @@ -13,25 +13,27 @@ public interface StudentService { int insertBatch(List list); - List selectBySchoolName(int analyseId , String schoolName); + public List selectBySchoolName(int analyseId,List league , String schoolName); List selectByClassName(int analyseId , String schoolName ,String className); - int selectCountByScore(int analyseId , String schoolName , double begin , double end); + public int selectCountByScore(int analyseId, List league , String schoolName, double begin, double end); int selectCountBySchoolScore(int analyseId , String schoolName ,String className , double begin , double end); List selectClassNameBySchool(int analyseId , String schoolName); - Double selectMaxScore(int analyseId , String schoolName); + List selectSchoolNameByAnalyse(int analyseId); - Double selectMinScore(int analyseId , String schoolName); + Double selectMaxScore(int analyseId, List league ,String schoolName); - Double selectAvgScore(int analyseId , String schoolName); + Double selectMinScore(int analyseId, List league ,String schoolName); + + Double selectAvgScore(int analyseId, List league ,String schoolName); //众数 - Double selectModeNumber(int analyseId , String schoolName); + Double selectModeNumber(int analyseId,List league , String schoolName); //中位数 - Double selectMedian(int analyseId , String schoolName); + Double selectMedian(int analyseId,List league , String schoolName); //标准差 - Double selectStdev(int analyseId , String schoolName); + Double selectStdev(int analyseId,List league , String schoolName); } diff --git a/src/main/java/com/jevon/service/impl/LeagueServiceImpl.java b/src/main/java/com/jevon/service/impl/LeagueServiceImpl.java new file mode 100644 index 0000000..bd588b7 --- /dev/null +++ b/src/main/java/com/jevon/service/impl/LeagueServiceImpl.java @@ -0,0 +1,54 @@ +package com.jevon.service.impl; + +import com.jevon.mapper.LeagueMapper; +import com.jevon.model.League; +import com.jevon.service.LeagueService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 9:09 + */ +@Service +public class LeagueServiceImpl implements LeagueService { + + @Autowired + LeagueMapper leagueMapper; + + @Override + public int insertBatch(List list) { + return leagueMapper.insertBatch(list); + } + + @Override + public List selectByAnalyseId(int analyseId) { + League league = new League(); + league.setAnalyseId(analyseId); + return leagueMapper.selectByLeague(league); + } + + @Override + public List getLeagueBySchoolName(int analyseId, String schoolName) { + League league = new League(); + league.setAnalyseId(analyseId); + league.setSchoolName(schoolName); + List leagues = leagueMapper.selectByLeague(league); + if(leagues != null && leagues.size() > 0){ + League search = new League(); + search.setAnalyseId(analyseId); + search.setLeague(leagues.get(0).getLeague()); + List result = leagueMapper.selectByLeague(search); + List leagueSchoolName = new ArrayList<>(); + for(League league1 : result){ + leagueSchoolName.add(league1.getSchoolName()); + } + return leagueSchoolName ; + } + return null; + } +} diff --git a/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java b/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java index df22ddb..75cb467 100644 --- a/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java @@ -37,22 +37,24 @@ public class StudentDetailServiceImpl implements StudentDetailService { } @Override - public Double selectSumScore(int analyseId, String schoolName, String examNumber) { + public Double selectSumScore(int analyseId, List league , String schoolName, String examNumber) { StudentDetail studentDetail = new StudentDetail(); studentDetail.setAnalyseId(analyseId); studentDetail.setSchoolName(schoolName); studentDetail.setExamNumber(examNumber); + studentDetail.setSchoolNames(league); return studentDetailMapper.selectSumScore(studentDetail); } @Override - public int selectTrueByExamNumber(int analyseId, String schoolName, String examNumber, List studentNumbers , Double score) { + public int selectTrueByExamNumber(int analyseId,List league , String schoolName, String examNumber, List studentNumbers , Double score) { StudentDetail studentDetail = new StudentDetail(); studentDetail.setAnalyseId(analyseId); studentDetail.setSchoolName(schoolName); studentDetail.setExamNumber(examNumber); studentDetail.setScore(score); studentDetail.setStudentNumbers(studentNumbers); + studentDetail.setSchoolNames(league); return studentDetailMapper.selectTrueByExamNumber(studentDetail); } } diff --git a/src/main/java/com/jevon/service/impl/StudentServiceImpl.java b/src/main/java/com/jevon/service/impl/StudentServiceImpl.java index cc606d0..88496df 100644 --- a/src/main/java/com/jevon/service/impl/StudentServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/StudentServiceImpl.java @@ -37,10 +37,11 @@ public class StudentServiceImpl implements StudentService { } @Override - public List selectBySchoolName(int analyseId, String schoolName) { + public List selectBySchoolName(int analyseId , List league , String schoolName) { Student student = new Student(); student.setAnalyseId(analyseId); student.setSchoolName(schoolName); + student.setSchoolNames(league); return studentMapper.selectByStudent(student); } @@ -54,12 +55,13 @@ public class StudentServiceImpl implements StudentService { } @Override - public int selectCountByScore(int analyseId, String schoolName, double begin, double end) { + public int selectCountByScore(int analyseId, List league , String schoolName, double begin, double end) { Student student = new Student(); student.setAnalyseId(analyseId); student.setSchoolName(schoolName); student.setBegin(begin); student.setEnd(end); + student.setSchoolNames(league); return studentMapper.selectCountByScore(student); } @@ -82,50 +84,66 @@ public class StudentServiceImpl implements StudentService { } @Override - public Double selectMaxScore(int analyseId, String schoolName) { + public List selectSchoolNameByAnalyse(int analyseId) { + return studentMapper.selectSchoolNameByAnalyse(analyseId); + } + + @Override + public Double selectMaxScore(int analyseId,List league , String schoolName) { Student student = new Student(); student.setAnalyseId(analyseId); student.setSchoolName(schoolName); + student.setSchoolNames(league); return studentMapper.selectMaxScore(student); } @Override - public Double selectMinScore(int analyseId, String schoolName) { + public Double selectMinScore(int analyseId, List league ,String schoolName) { Student student = new Student(); student.setAnalyseId(analyseId); student.setSchoolName(schoolName); + student.setSchoolNames(league); return studentMapper.selectMinScore(student); } @Override - public Double selectAvgScore(int analyseId, String schoolName) { + public Double selectAvgScore(int analyseId,List league , String schoolName) { Student student = new Student(); student.setAnalyseId(analyseId); student.setSchoolName(schoolName); + student.setSchoolNames(league); return studentMapper.selectAvgScore(student); } @Override - public Double selectModeNumber(int analyseId, String schoolName) { + public Double selectModeNumber(int analyseId,List league , String schoolName) { Student student = new Student(); student.setAnalyseId(analyseId); student.setSchoolName(schoolName); - return studentMapper.selectModeNumber(student); + student.setSchoolNames(league); + List list = studentMapper.selectModeNumber(student); + if(list.size() > 1){ + return null ; + }else { + return list.get(0); + } } @Override - public Double selectMedian(int analyseId, String schoolName) { + public Double selectMedian(int analyseId,List league , String schoolName) { Student student = new Student(); student.setAnalyseId(analyseId); student.setSchoolName(schoolName); + student.setSchoolNames(league); return studentMapper.selectMedian(student); } @Override - public Double selectStdev(int analyseId, String schoolName) { + public Double selectStdev(int analyseId,List league , String schoolName) { Student student = new Student(); student.setAnalyseId(analyseId); student.setSchoolName(schoolName); + student.setSchoolNames(league); return studentMapper.selectStdev(student); } } diff --git a/src/main/java/com/jevon/vo/req/InitLeague.java b/src/main/java/com/jevon/vo/req/InitLeague.java new file mode 100644 index 0000000..308cc50 --- /dev/null +++ b/src/main/java/com/jevon/vo/req/InitLeague.java @@ -0,0 +1,30 @@ +package com.jevon.vo.req; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 9:28 + */ +public class InitLeague { + + private String league ; + private List schoolNames ; + + public String getLeague() { + return league; + } + + public void setLeague(String league) { + this.league = league; + } + + public List getSchoolNames() { + return schoolNames; + } + + public void setSchoolNames(List schoolNames) { + this.schoolNames = schoolNames; + } +} diff --git a/src/main/java/com/jevon/vo/req/InitLeagueReqVo.java b/src/main/java/com/jevon/vo/req/InitLeagueReqVo.java new file mode 100644 index 0000000..fc3509a --- /dev/null +++ b/src/main/java/com/jevon/vo/req/InitLeagueReqVo.java @@ -0,0 +1,30 @@ +package com.jevon.vo.req; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 9:30 + */ +public class InitLeagueReqVo { + + private int analyseId ; + private List data ; + + public int getAnalyseId() { + return analyseId; + } + + public void setAnalyseId(int analyseId) { + this.analyseId = analyseId; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form1.java b/src/main/java/com/jevon/wordDTO/Form1.java new file mode 100644 index 0000000..ed3eabd --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form1.java @@ -0,0 +1,37 @@ +package com.jevon.wordDTO; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 15:37 + */ +public class Form1 { + + private String level ; + private int number ; + private double prop ; + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public int getNumber() { + return number; + } + + public void setNumber(int number) { + this.number = number; + } + + public double getProp() { + return prop; + } + + public void setProp(double prop) { + this.prop = prop; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form1RepVO.java b/src/main/java/com/jevon/wordDTO/Form1RepVO.java new file mode 100644 index 0000000..5e03aec --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form1RepVO.java @@ -0,0 +1,31 @@ +package com.jevon.wordDTO; + +import java.util.List; +import java.util.Map; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 15:46 + */ +public class Form1RepVO { + + private Map map ; + private List list ; + + public Map getMap() { + return map; + } + + public void setMap(Map map) { + this.map = map; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form2.java b/src/main/java/com/jevon/wordDTO/Form2.java new file mode 100644 index 0000000..3b2c76f --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form2.java @@ -0,0 +1,73 @@ +package com.jevon.wordDTO; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 16:10 + */ +public class Form2 { + + private String name ; + private int studentNumber ; + private double studentProp ; + private int highNumber ; + private double highProp ; + private int lowNumber ; + private double lowProp ; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getStudentNumber() { + return studentNumber; + } + + public void setStudentNumber(int studentNumber) { + this.studentNumber = studentNumber; + } + + public int getHighNumber() { + return highNumber; + } + + public void setHighNumber(int highNumber) { + this.highNumber = highNumber; + } + + public double getHighProp() { + return highProp; + } + + public void setHighProp(double highProp) { + this.highProp = highProp; + } + + public int getLowNumber() { + return lowNumber; + } + + public void setLowNumber(int lowNumber) { + this.lowNumber = lowNumber; + } + + public double getLowProp() { + return lowProp; + } + + public void setLowProp(double lowProp) { + this.lowProp = lowProp; + } + + public double getStudentProp() { + return studentProp; + } + + public void setStudentProp(double studentProp) { + this.studentProp = studentProp; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form2RepVO.java b/src/main/java/com/jevon/wordDTO/Form2RepVO.java new file mode 100644 index 0000000..b2f0555 --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form2RepVO.java @@ -0,0 +1,23 @@ +package com.jevon.wordDTO; + +import com.jevon.vo.BaseVo; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 9:51 + */ +public class Form2RepVO extends BaseVo { + + private List data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form3.java b/src/main/java/com/jevon/wordDTO/Form3.java new file mode 100644 index 0000000..8d8113b --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form3.java @@ -0,0 +1,82 @@ +package com.jevon.wordDTO; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 9:03 + */ +public class Form3 { + + private String name ; + private Double maxScore ; + private Double average ; + private Double minScore ; + private Double apercent ; + private Double bpercent ; + private Double cpercent ; + private Double dpercent ; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Double getMaxScore() { + return maxScore; + } + + public void setMaxScore(Double maxScore) { + this.maxScore = maxScore; + } + + public Double getAverage() { + return average; + } + + public void setAverage(Double average) { + this.average = average; + } + + public Double getMinScore() { + return minScore; + } + + public void setMinScore(Double minScore) { + this.minScore = minScore; + } + + public Double getApercent() { + return apercent; + } + + public void setApercent(Double apercent) { + this.apercent = apercent; + } + + public Double getBpercent() { + return bpercent; + } + + public void setBpercent(Double bpercent) { + this.bpercent = bpercent; + } + + public Double getCpercent() { + return cpercent; + } + + public void setCpercent(Double cpercent) { + this.cpercent = cpercent; + } + + public Double getDpercent() { + return dpercent; + } + + public void setDpercent(Double dpercent) { + this.dpercent = dpercent; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form3RepVO.java b/src/main/java/com/jevon/wordDTO/Form3RepVO.java new file mode 100644 index 0000000..8041fa0 --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form3RepVO.java @@ -0,0 +1,23 @@ +package com.jevon.wordDTO; + +import com.jevon.vo.BaseVo; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 10:14 + */ +public class Form3RepVO extends BaseVo { + + private List data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form4.java b/src/main/java/com/jevon/wordDTO/Form4.java new file mode 100644 index 0000000..245e4ed --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form4.java @@ -0,0 +1,55 @@ +package com.jevon.wordDTO; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 9:51 + */ +public class Form4 { + + private String name ; + private Double modeNumber ; + private Double medianNumber ; + private Double stdev ; + private Double avgNumber ; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Double getModeNumber() { + return modeNumber; + } + + public void setModeNumber(Double modeNumber) { + this.modeNumber = modeNumber; + } + + public Double getMedianNumber() { + return medianNumber; + } + + public void setMedianNumber(Double medianNumber) { + this.medianNumber = medianNumber; + } + + public Double getStdev() { + return stdev; + } + + public void setStdev(Double stdev) { + this.stdev = stdev; + } + + public Double getAvgNumber() { + return avgNumber; + } + + public void setAvgNumber(Double avgNumber) { + this.avgNumber = avgNumber; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form4RepVO.java b/src/main/java/com/jevon/wordDTO/Form4RepVO.java new file mode 100644 index 0000000..9bb3f66 --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form4RepVO.java @@ -0,0 +1,23 @@ +package com.jevon.wordDTO; + +import com.jevon.vo.BaseVo; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 10:23 + */ +public class Form4RepVO extends BaseVo { + + private List data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form5.java b/src/main/java/com/jevon/wordDTO/Form5.java new file mode 100644 index 0000000..698aff5 --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form5.java @@ -0,0 +1,118 @@ +package com.jevon.wordDTO; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 9:59 + */ +public class Form5 { + + private String examNumber ; + private String difficultName ; + private Double score ; + private Double allRate ; + private Double leagueRate ; + private Double schoolRate ; + private Double allAvg ; + private Double leagueAvg ; + private Double schoolAvg ; + private Double allDist ; + private Double leagueDist ; + private Double schoolDist ; + + public String getExamNumber() { + return examNumber; + } + + public void setExamNumber(String examNumber) { + this.examNumber = examNumber; + } + + 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 getDifficultName() { + return difficultName; + } + + public void setDifficultName(String difficultName) { + this.difficultName = difficultName; + } + + public Double getLeagueRate() { + return leagueRate; + } + + public void setLeagueRate(Double leagueRate) { + this.leagueRate = leagueRate; + } + + public Double getLeagueAvg() { + return leagueAvg; + } + + public void setLeagueAvg(Double leagueAvg) { + this.leagueAvg = leagueAvg; + } + + public Double getLeagueDist() { + return leagueDist; + } + + public void setLeagueDist(Double leagueDist) { + this.leagueDist = leagueDist; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form5RepVO.java b/src/main/java/com/jevon/wordDTO/Form5RepVO.java new file mode 100644 index 0000000..13841c4 --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form5RepVO.java @@ -0,0 +1,23 @@ +package com.jevon.wordDTO; + +import com.jevon.vo.BaseVo; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 10:28 + */ +public class Form5RepVO extends BaseVo { + + private List data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form6.java b/src/main/java/com/jevon/wordDTO/Form6.java new file mode 100644 index 0000000..14cce34 --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form6.java @@ -0,0 +1,119 @@ +package com.jevon.wordDTO; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 11:25 + */ +public class Form6 { + private String dimensional ; + private Double score ; + private Double allRate ; + private Double leagueRate ; + private Double schoolRate ; + private Double allAvg ; + private Double leagueAvg ; + private Double schoolAvg ; + private Double allDist ; + private Double leagueDist ; + private Double schoolDist ; + + private String examNumber ; + + + 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; + } + + public String getDimensional() { + return dimensional; + } + + public void setDimensional(String dimensional) { + this.dimensional = dimensional; + } + + public Double getLeagueRate() { + return leagueRate; + } + + public void setLeagueRate(Double leagueRate) { + this.leagueRate = leagueRate; + } + + public Double getLeagueAvg() { + return leagueAvg; + } + + public void setLeagueAvg(Double leagueAvg) { + this.leagueAvg = leagueAvg; + } + + public Double getLeagueDist() { + return leagueDist; + } + + public void setLeagueDist(Double leagueDist) { + this.leagueDist = leagueDist; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form6RepVo.java b/src/main/java/com/jevon/wordDTO/Form6RepVo.java new file mode 100644 index 0000000..3f5431a --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form6RepVo.java @@ -0,0 +1,23 @@ +package com.jevon.wordDTO; + +import com.jevon.vo.BaseVo; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 10:51 + */ +public class Form6RepVo extends BaseVo { + + private List data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form7.java b/src/main/java/com/jevon/wordDTO/Form7.java new file mode 100644 index 0000000..15bee1a --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form7.java @@ -0,0 +1,28 @@ +package com.jevon.wordDTO; + +/** + * @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/Form8.java b/src/main/java/com/jevon/wordDTO/Form8.java new file mode 100644 index 0000000..f28d979 --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form8.java @@ -0,0 +1,55 @@ +package com.jevon.wordDTO; + +/** + * @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 leagueRate ; + 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; + } + + public Double getLeagueRate() { + return leagueRate; + } + + public void setLeagueRate(Double leagueRate) { + this.leagueRate = leagueRate; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form8RepVO.java b/src/main/java/com/jevon/wordDTO/Form8RepVO.java new file mode 100644 index 0000000..2ebef7a --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Form8RepVO.java @@ -0,0 +1,23 @@ +package com.jevon.wordDTO; + +import com.jevon.vo.BaseVo; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 10:47 + */ +public class Form8RepVO extends BaseVo { + + private List data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Table1.java b/src/main/java/com/jevon/wordDTO/Table1.java new file mode 100644 index 0000000..c2c8b11 --- /dev/null +++ b/src/main/java/com/jevon/wordDTO/Table1.java @@ -0,0 +1,28 @@ +package com.jevon.wordDTO; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 8:34 + */ +public class Table1 { + + private String score ; + private int number ; + + public String getScore() { + return score; + } + + public void setScore(String score) { + this.score = score; + } + + public int getNumber() { + return number; + } + + public void setNumber(int number) { + this.number = number; + } +} diff --git a/src/main/java/com/jevon/wordDTO/second/Form1.java b/src/main/java/com/jevon/wordDTO/second/Form1.java deleted file mode 100644 index 0535e63..0000000 --- a/src/main/java/com/jevon/wordDTO/second/Form1.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jevon.wordDTO.second; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/18 0018 15:37 - */ -public class Form1 { - - private String level ; - private int number ; - private double prop ; - - public String getLevel() { - return level; - } - - public void setLevel(String level) { - this.level = level; - } - - public int getNumber() { - return number; - } - - public void setNumber(int number) { - this.number = number; - } - - public double getProp() { - return prop; - } - - public void setProp(double prop) { - this.prop = prop; - } -} diff --git a/src/main/java/com/jevon/wordDTO/second/Form1RepVo.java b/src/main/java/com/jevon/wordDTO/second/Form1RepVo.java deleted file mode 100644 index 818832f..0000000 --- a/src/main/java/com/jevon/wordDTO/second/Form1RepVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jevon.wordDTO.second; - -import java.util.List; -import java.util.Map; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/18 0018 15:46 - */ -public class Form1RepVo { - - private Map map ; - private List list ; - - public Map getMap() { - return map; - } - - public void setMap(Map map) { - this.map = map; - } - - public List getList() { - return list; - } - - public void setList(List list) { - this.list = list; - } -} diff --git a/src/main/java/com/jevon/wordDTO/second/Form2.java b/src/main/java/com/jevon/wordDTO/second/Form2.java deleted file mode 100644 index 6bb408f..0000000 --- a/src/main/java/com/jevon/wordDTO/second/Form2.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.jevon.wordDTO.second; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/18 0018 16:10 - */ -public class Form2 { - - private String name ; - private int studentNumber ; - private int highNumber ; - private double highProp ; - private int lowNumber ; - private double lowProp ; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getStudentNumber() { - return studentNumber; - } - - public void setStudentNumber(int studentNumber) { - this.studentNumber = studentNumber; - } - - public int getHighNumber() { - return highNumber; - } - - public void setHighNumber(int highNumber) { - this.highNumber = highNumber; - } - - public double getHighProp() { - return highProp; - } - - public void setHighProp(double highProp) { - this.highProp = highProp; - } - - public int getLowNumber() { - return lowNumber; - } - - public void setLowNumber(int lowNumber) { - this.lowNumber = lowNumber; - } - - public double getLowProp() { - return lowProp; - } - - public void setLowProp(double lowProp) { - this.lowProp = lowProp; - } -} diff --git a/src/main/java/com/jevon/wordDTO/second/Form3.java b/src/main/java/com/jevon/wordDTO/second/Form3.java deleted file mode 100644 index 0dbece8..0000000 --- a/src/main/java/com/jevon/wordDTO/second/Form3.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.jevon.wordDTO.second; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 9:03 - */ -public class Form3 { - - private String name ; - private Double maxScore ; - private Double average ; - private Double minScore ; - private Double apercent ; - private Double bpercent ; - private Double cpercent ; - private Double dpercent ; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Double getMaxScore() { - return maxScore; - } - - public void setMaxScore(Double maxScore) { - this.maxScore = maxScore; - } - - public Double getAverage() { - return average; - } - - public void setAverage(Double average) { - this.average = average; - } - - public Double getMinScore() { - return minScore; - } - - public void setMinScore(Double minScore) { - this.minScore = minScore; - } - - public Double getApercent() { - return apercent; - } - - public void setApercent(Double apercent) { - this.apercent = apercent; - } - - public Double getBpercent() { - return bpercent; - } - - public void setBpercent(Double bpercent) { - this.bpercent = bpercent; - } - - public Double getCpercent() { - return cpercent; - } - - public void setCpercent(Double cpercent) { - this.cpercent = cpercent; - } - - public Double getDpercent() { - return dpercent; - } - - public void setDpercent(Double dpercent) { - this.dpercent = dpercent; - } -} diff --git a/src/main/java/com/jevon/wordDTO/second/Form4.java b/src/main/java/com/jevon/wordDTO/second/Form4.java deleted file mode 100644 index 7f4a32c..0000000 --- a/src/main/java/com/jevon/wordDTO/second/Form4.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.jevon.wordDTO.second; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 9:51 - */ -public class Form4 { - - private String name ; - private Double modeNumber ; - private Double medianNumber ; - private Double stdev ; - private Double avgNumber ; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Double getModeNumber() { - return modeNumber; - } - - public void setModeNumber(Double modeNumber) { - this.modeNumber = modeNumber; - } - - public Double getMedianNumber() { - return medianNumber; - } - - public void setMedianNumber(Double medianNumber) { - this.medianNumber = medianNumber; - } - - public Double getStdev() { - return stdev; - } - - public void setStdev(Double stdev) { - this.stdev = stdev; - } - - public Double getAvgNumber() { - return avgNumber; - } - - public void setAvgNumber(Double avgNumber) { - this.avgNumber = avgNumber; - } -} diff --git a/src/main/java/com/jevon/wordDTO/second/Form6.java b/src/main/java/com/jevon/wordDTO/second/Form6.java deleted file mode 100644 index f16bf8a..0000000 --- a/src/main/java/com/jevon/wordDTO/second/Form6.java +++ /dev/null @@ -1,91 +0,0 @@ -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 deleted file mode 100644 index a17f0af..0000000 --- a/src/main/java/com/jevon/wordDTO/second/Form7.java +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index 62be0ca..0000000 --- a/src/main/java/com/jevon/wordDTO/second/Form8.java +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index ea52be1..0000000 --- a/src/main/java/com/jevon/wordDTO/second/From5.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.jevon.wordDTO.second; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 9:59 - */ -public class From5 { - - private String examNumber ; - private String difficultName ; - private Double score ; - private Double allRate ; - private Double schoolRate ; - private Double allAvg ; - private Double schoolAvg ; - private Double allDist ; - private Double schoolDist ; - - public String getExamNumber() { - return examNumber; - } - - public void setExamNumber(String examNumber) { - this.examNumber = examNumber; - } - - 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 getDifficultName() { - return difficultName; - } - - public void setDifficultName(String difficultName) { - this.difficultName = difficultName; - } -} diff --git a/src/main/java/com/jevon/wordDTO/second/Table1.java b/src/main/java/com/jevon/wordDTO/second/Table1.java deleted file mode 100644 index f8ba1fd..0000000 --- a/src/main/java/com/jevon/wordDTO/second/Table1.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jevon.wordDTO.second; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 8:34 - */ -public class Table1 { - - private String score ; - private int number ; - - public String getScore() { - return score; - } - - public void setScore(String score) { - this.score = score; - } - - public int getNumber() { - return number; - } - - public void setNumber(int number) { - this.number = number; - } -} diff --git a/src/main/resources/mapping/AnalyseMapper.xml b/src/main/resources/mapping/AnalyseMapper.xml index 94442ff..2173dee 100644 --- a/src/main/resources/mapping/AnalyseMapper.xml +++ b/src/main/resources/mapping/AnalyseMapper.xml @@ -32,13 +32,15 @@ - select * from sz_learn_dimensional where 1=1 - - and dimensional_type = #{dimensionalType} - - - and dimensional_name = #{dimensionalName} - + select * from sz_learn_dimensional + + + and dimensional_type = #{dimensionalType} + + + and dimensional_name = #{dimensionalName} + + + select * from sz_learn_league + + + and analyse_id = #{analyseId} + + + and league = #{league} + + + and school_name = #{schoolName} + + + + \ No newline at end of file diff --git a/src/main/resources/mapping/StudentDetailMapper.xml b/src/main/resources/mapping/StudentDetailMapper.xml index 0e98157..31b2ae4 100644 --- a/src/main/resources/mapping/StudentDetailMapper.xml +++ b/src/main/resources/mapping/StudentDetailMapper.xml @@ -2,7 +2,7 @@ - + @@ -25,33 +25,54 @@ \ No newline at end of file diff --git a/src/main/resources/mapping/StudentMapper.xml b/src/main/resources/mapping/StudentMapper.xml index b864b84..ba41521 100644 --- a/src/main/resources/mapping/StudentMapper.xml +++ b/src/main/resources/mapping/StudentMapper.xml @@ -24,89 +24,152 @@ - - + + + + @@ -116,19 +179,32 @@ avg(DISTINCT score) FROM ( select T1.score from sz_learn_student T1 , sz_learn_student T2 - WHERE 1=1 - - and T1.analyse_id = #{analyseId} - - - and T1.school_name = #{schoolName} - - - and T2.analyse_id = #{analyseId} - - - and T2.school_name = #{schoolName} - + + + and T1.analyse_id = #{analyseId} + + + and T1.school_name = #{schoolName} + + + and T2.analyse_id = #{analyseId} + + + and T2.school_name = #{schoolName} + + + AND T1.school_name IN + + #{item} + + + + AND T2.school_name IN + + #{item} + + + GROUP BY T1.score HAVING @@ -137,12 +213,20 @@ \ No newline at end of file -- libgit2 0.21.0