From 068fc7f2e81178e55fa191a13709af64b1a163f6 Mon Sep 17 00:00:00 2001 From: EricsHu <hrr145632> Date: 星期一, 05 十二月 2022 14:27:43 +0800 Subject: [PATCH] 处理编码 --- src/main/java/com/qxueyou/scc/exam/action/ExamController.java | 198 ++++++++++++++++++++++++------------------------ 1 files changed, 99 insertions(+), 99 deletions(-) diff --git a/src/main/java/com/qxueyou/scc/exam/action/ExamController.java b/src/main/java/com/qxueyou/scc/exam/action/ExamController.java index 4f61ae9..43a1405 100644 --- a/src/main/java/com/qxueyou/scc/exam/action/ExamController.java +++ b/src/main/java/com/qxueyou/scc/exam/action/ExamController.java @@ -60,18 +60,18 @@ * @history 2018-03-11 create kevin * */ -@Api(tags = "考试管理接口") +@Api(tags = "鑰冭瘯绠$悊鎺ュ彛") @Controller @CrossOrigin(origins="*",maxAge=3600) @RequestMapping(value = "/exam/exam") public class ExamController { private final Logger log = LogManager.getLogger(ExamController.class); - // 分页查询中,默认记录条数和页数 + // 鍒嗛〉鏌ヨ涓紝榛樿璁板綍鏉℃暟鍜岄〉鏁� private static final int DEFAULT_PAGE_SIZE = 10; private static final int DEFAULT_PAGE_NUM = 1; - //生成密码长度 + //鐢熸垚瀵嗙爜闀垮害 private static final int EXAM_CERT_PWD_LENGTH = 8; @Autowired @@ -103,14 +103,14 @@ IClassService classService; /** - * 考试列表 + * 鑰冭瘯鍒楄〃 */ @SuppressWarnings("unchecked") @RequestMapping(value = "list", method = RequestMethod.GET) public @ResponseBody Result list(String keyword,String classId,String subjectId,Short status,Integer pageSize,Integer pageNum) { pageSize = pageSize != null && pageSize > 0 ? pageSize : DEFAULT_PAGE_SIZE; pageNum = pageNum != null && pageNum > 0 ? pageNum : DEFAULT_PAGE_NUM; - //总考试数量 + //鎬昏�冭瘯鏁伴噺 int totalCount = examService.listCount(keyword == null ? "" : keyword.trim(),classId,subjectId,status); Pager pager = new Pager(pageSize,pageNum); pager.setTotalCount(totalCount); @@ -125,7 +125,7 @@ if(listResult!=null && listResult.size()>0){ - //查询待批阅,已批阅,未提交数量 + //鏌ヨ寰呮壒闃咃紝宸叉壒闃咃紝鏈彁浜ゆ暟閲� Map<String,Integer> countMap = examService.queryExamResultStatusCount(QBeanUtils.listPropertyVal(list, "examId")); countMap = countMap==null?new HashMap<String,Integer>(1):countMap; Integer tempCount = null; @@ -164,13 +164,13 @@ private String getExamProgressStatus(List<ExamBatchInfo> lstBatchInfos){ if(lstBatchInfos == null ||lstBatchInfos.size()==0){ - return "已结束"; + return "宸茬粨鏉�"; } - String progressStatus="待开始"; + String progressStatus="寰呭紑濮�"; Date now = new Date(); - //根据开始时间倒序 + //鏍规嵁寮�濮嬫椂闂村�掑簭 lstBatchInfos.sort(new Comparator<ExamBatchInfo>(){ @Override public int compare(ExamBatchInfo o1, ExamBatchInfo o2) { @@ -178,13 +178,13 @@ } }); - //如果所有批次都小于当前时间,则已结束,如果有一个批次正在进行中,则进行中 + //濡傛灉鎵�鏈夋壒娆¢兘灏忎簬褰撳墠鏃堕棿锛屽垯宸茬粨鏉燂紝濡傛灉鏈変竴涓壒娆℃鍦ㄨ繘琛屼腑锛屽垯杩涜涓� if(lstBatchInfos.get(0).getEndTime().getTime()<now.getTime()){ - progressStatus="已结束"; + progressStatus="宸茬粨鏉�"; }else{ for(ExamBatchInfo f : lstBatchInfos){ if(f.getStartTime().getTime()<=now.getTime() && f.getEndTime().getTime()>=now.getTime()){ - progressStatus = "进行中"; + progressStatus = "杩涜涓�"; break; } } @@ -194,22 +194,22 @@ /** - * 教师查看考试成绩列表 + * 鏁欏笀鏌ョ湅鑰冭瘯鎴愮哗鍒楄〃 * * @return */ - @ApiOperation(value = "老师查看学生考试结果列表") + @ApiOperation(value = "鑰佸笀鏌ョ湅瀛︾敓鑰冭瘯缁撴灉鍒楄〃") @ApiImplicitParams({ - @ApiImplicitParam(name="examId", dataType="String", paramType="query", value="考试id", required=true), - @ApiImplicitParam(name="examBatchId", dataType="String", paramType="query", value="批次id", required=true), - @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="班级id", required=true), + @ApiImplicitParam(name="examId", dataType="String", paramType="query", value="鑰冭瘯id", required=true), + @ApiImplicitParam(name="examBatchId", dataType="String", paramType="query", value="鎵规id", required=true), + @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="鐝骇id", required=true), }) @RequestMapping(value = "teacher/examresultlist", method = RequestMethod.GET) public @ResponseBody Result queryStudentExamResultList(String examId, String examBatchId, String classId,String keyword, Integer pageSize, Integer pageNum) { pageSize = pageSize != null && pageSize > 0 ? pageSize : DEFAULT_PAGE_SIZE; pageNum = pageNum != null && pageNum > 0 ? pageNum : DEFAULT_PAGE_NUM; - //总考试数量 + //鎬昏�冭瘯鏁伴噺 int totalCount = examService.listResultCount(examId, StringUtils.isEmpty(examBatchId)?null:new String[]{examBatchId}, classId, keyword == null ? "" : keyword.trim()); @@ -229,7 +229,7 @@ for(Map<String, Object> map:listResult){ map.put("rank", rank); map.put("isPass", (map.get("studentScore")==null ? BigDecimal.ZERO :(BigDecimal)map.get("studentScore")) - .compareTo((BigDecimal)map.get("passingScore")) == -1 ? "否" : "是"); + .compareTo((BigDecimal)map.get("passingScore")) == -1 ? "鍚�" : "鏄�"); rank++; } @@ -237,23 +237,23 @@ } /** - * 详情页面数据 + * 璇︽儏椤甸潰鏁版嵁 * * @param examId * @return */ - @ApiOperation(value = "详情页面数据") + @ApiOperation(value = "璇︽儏椤甸潰鏁版嵁") @ApiImplicitParams({ - @ApiImplicitParam(name="examId", dataType="String", paramType="query", value="考试id", required=true), + @ApiImplicitParam(name="examId", dataType="String", paramType="query", value="鑰冭瘯id", required=true), }) @RequestMapping(value = "/detail", method = RequestMethod.GET) public @ResponseBody Result detail(String examId) { return new Result(true,"",CollectionUtils.newObjectMap("detail",examService.queryExamDetail(examId))); } - @ApiOperation(value = "获取补考考试,根据maxLateMin标记") + @ApiOperation(value = "鑾峰彇琛ヨ�冭�冭瘯锛屾牴鎹甿axLateMin鏍囪") @ApiImplicitParams({ -// @ApiImplicitParam(name="examId", dataType="String", paramType="query", value="考试id", required=true), +// @ApiImplicitParam(name="examId", dataType="String", paramType="query", value="鑰冭瘯id", required=true), }) @RequestMapping(value = "/getReExam", method = RequestMethod.GET) public @ResponseBody Result getReExam() { @@ -261,7 +261,7 @@ } /** - * 保存 + * 淇濆瓨 * * @param examInfo * @return @@ -280,20 +280,20 @@ } /** - * 保存 + * 淇濆瓨 * @param * @return */ @RequestMapping(value = "/saveRemedy", method = RequestMethod.POST) public @ResponseBody Result saveRemedy(@RequestBody ExamBatchInfo examBatchInfo) { Result result = null; - //获取考试ID + //鑾峰彇鑰冭瘯ID String examId = examBatchInfo.getExamId(); - //获取开始时间 + //鑾峰彇寮�濮嬫椂闂� Date startTime = examBatchInfo.getStartTime(); - //获取结束时间 + //鑾峰彇缁撴潫鏃堕棿 Date endTime = examBatchInfo.getEndTime(); - //生成补考考试 + //鐢熸垚琛ヨ�冭�冭瘯 examService.addRemedy(examId,startTime,endTime); result = new Result(true,"",CollectionUtils.newObjectMap("examId", examId)); @@ -301,13 +301,13 @@ } /** - * 删除 + * 鍒犻櫎 * * @param examIds * @return */ - @ApiOperation(value = "删除考试", notes = "根据传入的考试ID字符串参数进行删除(多个ID以逗号分割, 如:examId1,examId2)", httpMethod = "GET") - @ApiImplicitParam(name = "examIds", value = "考试ID字符串", required = true, dataType = "String", paramType = "body") + @ApiOperation(value = "鍒犻櫎鑰冭瘯", notes = "鏍规嵁浼犲叆鐨勮�冭瘯ID瀛楃涓插弬鏁拌繘琛屽垹闄�(澶氫釜ID浠ラ�楀彿鍒嗗壊锛� 濡傦細examId1,examId2)", httpMethod = "GET") + @ApiImplicitParam(name = "examIds", value = "鑰冭瘯ID瀛楃涓�", required = true, dataType = "String", paramType = "body") @RequestMapping(value = "delete", method = RequestMethod.GET) public @ResponseBody Result delete(String examIds) { Result result = new Result(true); @@ -318,7 +318,7 @@ } /** - * 设置考试题目 + * 璁剧疆鑰冭瘯棰樼洰 * * @param examInfo * @return @@ -329,7 +329,7 @@ } /** - * 发布考试 + * 鍙戝竷鑰冭瘯 * * @param * @return @@ -337,13 +337,13 @@ @RequestMapping(value = "/publish", method = RequestMethod.GET) public @ResponseBody Result publishExam(String examIds) { if (StringUtils.isEmpty(examIds)) { - return new Result(false, "参数错误"); + return new Result(false, "鍙傛暟閿欒"); } return this.examService.doPublishExam(examIds.split(",")); } /** - * 撤回考试 + * 鎾ゅ洖鑰冭瘯 * * @param * @return @@ -351,22 +351,22 @@ @RequestMapping(value = "/revoke", method = RequestMethod.GET) public @ResponseBody Result revokeExam(String examIds) { if (StringUtils.isEmpty(examIds)) { - return new Result(false, "参数错误"); + return new Result(false, "鍙傛暟閿欒"); } return this.examService.doRevokeExam(examIds.split(",")); } /** - * 学生考试信息列表 + * 瀛︾敓鑰冭瘯淇℃伅鍒楄〃 * * @return */ - @ApiOperation(value = "学生考试信息列表") + @ApiOperation(value = "瀛︾敓鑰冭瘯淇℃伅鍒楄〃") @ApiImplicitParams({ - @ApiImplicitParam(name="keyword", dataType="String", paramType="query", value="关键字考试名称模糊查询"), - @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="班级id"), - @ApiImplicitParam(name="subjectId", dataType="String", paramType="query", value="课程id", required=false), - @ApiImplicitParam(name="status", dataType="String", paramType="query", value="状态(默认全部,1未开始,2未交卷,3已交卷,4逾期未交,5已批阅)", required=false), + @ApiImplicitParam(name="keyword", dataType="String", paramType="query", value="鍏抽敭瀛楄�冭瘯鍚嶇О妯$硦鏌ヨ"), + @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="鐝骇id"), + @ApiImplicitParam(name="subjectId", dataType="String", paramType="query", value="璇剧▼id", required=false), + @ApiImplicitParam(name="status", dataType="String", paramType="query", value="鐘舵�侊紙榛樿鍏ㄩ儴锛�1鏈紑濮嬶紝2鏈氦鍗凤紝3宸蹭氦鍗凤紝4閫炬湡鏈氦,5宸叉壒闃咃級", required=false), }) @RequestMapping(value = "/student/list", method = RequestMethod.GET) public @ResponseBody Result queryStudentExamList(String keyword, String classId, String subjectId, Integer status, Integer pageSize, Integer pageNum) { @@ -402,17 +402,17 @@ return new Result(true,"",CollectionUtils.newObjectMap("stuExams",listResult,"examCount",totalCount)); } /** - * 学生考试信息列表 + * 瀛︾敓鑰冭瘯淇℃伅鍒楄〃 * * @return */ - @ApiOperation(value = "学生考试信息列表") + @ApiOperation(value = "瀛︾敓鑰冭瘯淇℃伅鍒楄〃") @ApiImplicitParams({ - @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="班级id"), + @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="鐝骇id"), }) @RequestMapping(value = "/student/nowExam", method = RequestMethod.GET) public @ResponseBody Result queryStudentExam(String classId) { - //获取当前考试列表以结束时间排序最新的在最前面 + //鑾峰彇褰撳墠鑰冭瘯鍒楄〃浠ョ粨鏉熸椂闂存帓搴忔渶鏂扮殑鍦ㄦ渶鍓嶉潰 String [] classIds= null; if(!StringUtils.isEmpty(classId)){ classIds = new String[]{classId}; @@ -437,14 +437,14 @@ return new Result(true,"",CollectionUtils.newObjectMap("stuExams",listResult!=null && listResult.size()>0?listResult.get(0):null)); } - @ApiOperation(value = "学生考试信息列表") + @ApiOperation(value = "瀛︾敓鑰冭瘯淇℃伅鍒楄〃") @ApiImplicitParams({ - @ApiImplicitParam(name="examBatchId", dataType="String", paramType="query", value="班级id"), - @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="班级id") + @ApiImplicitParam(name="examBatchId", dataType="String", paramType="query", value="鐝骇id"), + @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="鐝骇id") }) @RequestMapping(value = "/student/record", method = RequestMethod.GET) public @ResponseBody Result queryStudentRecord(String examBatchId, String classId) { - // 查询是否有进行中的考试 + // 鏌ヨ鏄惁鏈夎繘琛屼腑鐨勮�冭瘯 ExerciseRecord record = commonDAO.findUnique( "from ExerciseRecord where examBatchId=? and classId=? and userId = ? and deleteFlag is false ", CollectionUtils.newList(examBatchId,classId,ClientUtils.getUserId()), @@ -454,13 +454,13 @@ } /** - * 学生考试信息列表 + * 瀛︾敓鑰冭瘯淇℃伅鍒楄〃 * * @return */ - @ApiOperation(value = "学生考试信息列表") + @ApiOperation(value = "瀛︾敓鑰冭瘯淇℃伅鍒楄〃") @ApiImplicitParams({ - @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="班级id"), + @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="鐝骇id"), }) @RequestMapping(value = "/student/stuMessage", method = RequestMethod.GET) public @ResponseBody Result queryStudent() { @@ -469,21 +469,21 @@ } /** - * 根据考试批次ID获取考试题目信息 + * 鏍规嵁鑰冭瘯鎵规ID鑾峰彇鑰冭瘯棰樼洰淇℃伅 * * @param examBatchId * @return */ - @ApiOperation(value = "学生开始考试接口") + @ApiOperation(value = "瀛︾敓寮�濮嬭�冭瘯鎺ュ彛") @ApiImplicitParams({ - @ApiImplicitParam(name="examBatchId", dataType="String", paramType="query", value="考试批次id", required=true), - @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="班级id", required=false) + @ApiImplicitParam(name="examBatchId", dataType="String", paramType="query", value="鑰冭瘯鎵规id", required=true), + @ApiImplicitParam(name="classId", dataType="String", paramType="query", value="鐝骇id", required=false) }) @RequestMapping(value = "/student/startexam", method = RequestMethod.GET) public @ResponseBody Result doStartExam(String examBatchId, String classId,String studentUserId) { if (StringUtils.isEmpty(examBatchId) || StringUtils.isEmpty(classId)) { - return new Result(false, "参数错误,班级,考试批次不能为空"); + return new Result(false, "鍙傛暟閿欒,鐝骇锛岃�冭瘯鎵规涓嶈兘涓虹┖"); } Result result = this.examService.doStartExam(examBatchId,classId,StringUtils.isNotEmpty(studentUserId)?studentUserId:ClientUtils.getUserId()); @@ -496,9 +496,9 @@ return result; } - @ApiOperation(value = "学生开始补考接口") + @ApiOperation(value = "瀛︾敓寮�濮嬭ˉ鑰冩帴鍙�") @ApiImplicitParams({ - @ApiImplicitParam(name="examId", dataType="String", paramType="query", value="考试批次id", required=true), + @ApiImplicitParam(name="examId", dataType="String", paramType="query", value="鑰冭瘯鎵规id", required=true), }) @RequestMapping(value = "/student/startReExam", method = RequestMethod.GET) public @ResponseBody Result doStartReExam(String examId) { @@ -511,9 +511,9 @@ } return result; } - @ApiOperation(value = "学生补考记录") + @ApiOperation(value = "瀛︾敓琛ヨ�冭褰�") @ApiImplicitParams({ -// @ApiImplicitParam(name="examId", dataType="String", paramType="query", value="考试批次id", required=true), +// @ApiImplicitParam(name="examId", dataType="String", paramType="query", value="鑰冭瘯鎵规id", required=true), }) @RequestMapping(value = "/student/getReExamRecordList", method = RequestMethod.GET) public @ResponseBody Result getReExamRecordList() { @@ -526,20 +526,20 @@ }); return reExamRecordList; } - return new Result(false,"没有设置补考"); + return new Result(false,"娌℃湁璁剧疆琛ヨ��"); } - @ApiOperation(value = "学生考试详情") - @ApiImplicitParams({@ApiImplicitParam(name="examBatchId", dataType="String", paramType="query", value="考试批次id", required=true)}) + @ApiOperation(value = "瀛︾敓鑰冭瘯璇︽儏") + @ApiImplicitParams({@ApiImplicitParam(name="examBatchId", dataType="String", paramType="query", value="鑰冭瘯鎵规id", required=true)}) @RequestMapping(value = "/student/examdetail", method = RequestMethod.GET) public @ResponseBody Result viewExamDetail(String examBatchId) { ExamBatchInfo batchInfo = this.commonService.read(ExamBatchInfo.class, examBatchId); - //考试信息 + //鑰冭瘯淇℃伅 ExamInfo examInfo =this.examService.queryExamDetail(batchInfo.getExamId()); examInfo.setExamStartTime(batchInfo.getStartTime()); examInfo.setExamEndTime(batchInfo.getEndTime()); - // 获取考卷信息 + // 鑾峰彇鑰冨嵎淇℃伅 Map<String, ExamPaperInfo> paperStatistic =null; if(examInfo.getExamType()!=ExamInfo.EXAM_TYPE_RANDOM && examInfo.getExamType()!=ExamInfo.EXAM_TYPE_RANDOM_BY_GROUP){ paperStatistic = examPaperService.queryExamPaperItemsStatistic( @@ -548,55 +548,55 @@ return new Result(true,"",CollectionUtils.newObjectMap("examInfo",examInfo,"paperStatistic",paperStatistic)); } - @ApiOperation(value = "提交考试答案") - @ApiImplicitParams({@ApiImplicitParam(name="answers", dataType="String", paramType="query", value="提交答案", required=true)}) + @ApiOperation(value = "鎻愪氦鑰冭瘯绛旀") + @ApiImplicitParams({@ApiImplicitParam(name="answers", dataType="String", paramType="query", value="鎻愪氦绛旀", required=true)}) @RequestMapping(value = "/student/submitExam", method = RequestMethod.POST) public @ResponseBody Object doSubmitExamAnswer(@RequestParam(value = "answers") String answers) throws IOException { Result result = new Result(true); - // 用户本次做题提交的数据 + // 鐢ㄦ埛鏈鍋氶鎻愪氦鐨勬暟鎹� String recordId =null; // try { ExerciseSubmitAnswerData answerData = new ObjectMapper().readValue(answers, ExerciseSubmitAnswerData.class); recordId = answerData.getExerciseRecordId(); - // 提交试卷答案 - result = new Result(true, "答案提交成功",exerciseVerService.doOperExerciseAnswerData(answerData)); - // 记录提交的数据日志 + // 鎻愪氦璇曞嵎绛旀 + result = new Result(true, "绛旀鎻愪氦鎴愬姛",exerciseVerService.doOperExerciseAnswerData(answerData)); + // 璁板綍鎻愪氦鐨勬暟鎹棩蹇� exerciseVerService.doSaveExerciseDataSubmitLog(answers, recordId,ExerciseDataSubmitLog.TYPE_SUBMIT_ANSWER, ExerciseDataSubmitLog.STATUS_SUCCESS,"/exercise/Exercise/exerAnswers"); // } catch (Exception e) { -// log.error("考试保存错误", e); -// result = new Result(false, "提交考试答案请求异常"); +// log.error("鑰冭瘯淇濆瓨閿欒", e); +// result = new Result(false, "鎻愪氦鑰冭瘯绛旀璇锋眰寮傚父"); // exerciseVerService.doSaveExerciseDataSubmitLog(answers, recordId,ExerciseDataSubmitLog.TYPE_SUBMIT_ANSWER, ExerciseDataSubmitLog.STATUS_FAILED,"/exercise/Exercise/exerAnswers"); // } return result; } - @ApiOperation(value = "老师阅卷") - @ApiImplicitParams({@ApiImplicitParam(name="answerData", dataType="object", paramType="query", value="提交答案", required=true)}) + @ApiOperation(value = "鑰佸笀闃呭嵎") + @ApiImplicitParams({@ApiImplicitParam(name="answerData", dataType="object", paramType="query", value="鎻愪氦绛旀", required=true)}) @RequestMapping(value = "/teacher/checkExam", method = RequestMethod.POST) public @ResponseBody Object doCheckExam(@RequestBody ExerciseSubmitAnswerData answerData) { Result result = new Result(true); String recordId = null; try { - // 提交记录id + // 鎻愪氦璁板綍id recordId = answerData.getExerciseRecordId(); - // 提交试卷答案 - result = new Result(true, "答案提交成功",exerciseVerService.doOperExerciseAnswerData(answerData)); - // 记录提交的数据日志 + // 鎻愪氦璇曞嵎绛旀 + result = new Result(true, "绛旀鎻愪氦鎴愬姛",exerciseVerService.doOperExerciseAnswerData(answerData)); + // 璁板綍鎻愪氦鐨勬暟鎹棩蹇� exerciseVerService.doSaveExerciseDataSubmitLog(JSON.toJSONString(answerData),recordId,ExerciseDataSubmitLog.TYPE_SUBMIT_ANSWER, ExerciseDataSubmitLog.STATUS_SUCCESS,"/exam/exam/teacher/checkExam"); } catch (Exception e) { - log.error("考试保存错误", e); - result = new Result(false, "提交练习答案请求异常"); + log.error("鑰冭瘯淇濆瓨閿欒", e); + result = new Result(false, "鎻愪氦缁冧範绛旀璇锋眰寮傚父"); exerciseVerService.doSaveExerciseDataSubmitLog(JSON.toJSONString(answerData),recordId,ExerciseDataSubmitLog.TYPE_SUBMIT_ANSWER, ExerciseDataSubmitLog.STATUS_FAILED,"/exam/exam/teacher/checkExam"); } return result; } /** - * 查询考试凭证信息列表 + * 鏌ヨ鑰冭瘯鍑瘉淇℃伅鍒楄〃 * * @return */ - @ApiOperation(value = "查询学生考试凭证") + @ApiOperation(value = "鏌ヨ瀛︾敓鑰冭瘯鍑瘉") @RequestMapping(value = "/teacher/examacertificatelist", method = RequestMethod.GET) public @ResponseBody Result queryStudentExamCertificateList(String examId, String classId, String examBatchId, String keyword, Integer pageSize, Integer pageNum) { @@ -604,7 +604,7 @@ StringBuffer hql = new StringBuffer(500); hql.append("select r.classId from ExamBatchInfo f,ExamBatchClassRe r where f.examBatchId = r.examBatchId and f.deleteFlag is false and r.deleteFlag is false "); - // 如果examBatchId为空,则获取考试对应的所有批次 + // 濡傛灉examBatchId涓虹┖锛屽垯鑾峰彇鑰冭瘯瀵瑰簲鐨勬墍鏈夋壒娆� if (StringUtils.isNotEmpty(examBatchId)) { hql.append(" and f.examBatchId=:examBatchId"); queryParams.put("examBatchId", examBatchId); @@ -614,16 +614,16 @@ } List<String> classLst =this.commonDAO.findByComplexHql(hql.toString(), queryParams, String.class); - //如果不存在关联的班级信息,则直接返回 + //濡傛灉涓嶅瓨鍦ㄥ叧鑱旂殑鐝骇淇℃伅锛屽垯鐩存帴杩斿洖 if (classLst == null || classLst.size() == 0) { - return new Result(false,"无班级考生信息",CollectionUtils.newObjectMap("list",null)); + return new Result(false,"鏃犵彮绾ц�冪敓淇℃伅",CollectionUtils.newObjectMap("list",null)); } - // 查询记录数 + // 鏌ヨ璁板綍鏁� int totalCount = commonDAO.findCountByComplexHql("from StuStudent t WHERE t.classId in(:classIds) and t.deleteFlag is false", CollectionUtils.newObjectMap("classIds",classLst.toArray(new String[]{}))); - // page赋值 + // page璧嬪�� Pager page = new Pager(); page.setTotalCount(totalCount); page.setPageSize(pageSize != null && pageSize > 0 ? pageSize : DEFAULT_PAGE_SIZE); @@ -638,16 +638,16 @@ } /** - * 学生考试信息列表 + * 瀛︾敓鑰冭瘯淇℃伅鍒楄〃 * * @return */ - @ApiOperation(value = "生成学生考试凭证") + @ApiOperation(value = "鐢熸垚瀛︾敓鑰冭瘯鍑瘉") @RequestMapping(value = "/teacher/genstudentacertificate", method = RequestMethod.GET) public @ResponseBody Result queryStudentExamCertificateList(String examId, String examBatchId) { Map<String, Object> queryParams = new HashMap<String, Object>(1); - // 如果examBatchId为空,则获取考试对应的所有批次 + // 濡傛灉examBatchId涓虹┖锛屽垯鑾峰彇鑰冭瘯瀵瑰簲鐨勬墍鏈夋壒娆� String hql ="select distinct r.classId from ExamBatchInfo f,ExamBatchClassRe r where f.examBatchId = r.examBatchId and f.deleteFlag is false and r.deleteFlag is false"; if (StringUtils.isNotEmpty(examBatchId)) { @@ -660,12 +660,12 @@ List<String> classLst =this.commonDAO.findByComplexHql(hql, queryParams, String.class); - //如果不存在关联的班级信息,则直接返回 + //濡傛灉涓嶅瓨鍦ㄥ叧鑱旂殑鐝骇淇℃伅锛屽垯鐩存帴杩斿洖 if (classLst == null || classLst.size() == 0) { - return new Result(false, "无班级考生信息",CollectionUtils.newObjectMap("list", null)); + return new Result(false, "鏃犵彮绾ц�冪敓淇℃伅",CollectionUtils.newObjectMap("list", null)); } - //查询所有学生用户信息 + //鏌ヨ鎵�鏈夊鐢熺敤鎴蜂俊鎭� List<User> lstUser = this.commonDAO.findByComplexHql( "select distinct u from StuStudent t,User u WHERE t.userId=u.userId AND t.classId in(:classIds) and t.deleteFlag is false and u.deleteFlag is false", CollectionUtils.newObjectMap("classIds",classLst.toArray(new String[]{})),User.class); @@ -677,7 +677,7 @@ } if(!this.userService.doBatchUpdateUser(lstUser)){ - return new Result(false,"更新学生考试凭证密码失败!"); + return new Result(false,"鏇存柊瀛︾敓鑰冭瘯鍑瘉瀵嗙爜澶辫触!"); } return new Result(true); -- Gitblit v1.8.0