From 8f88069a84455432bfcf83895191f036d730b588 Mon Sep 17 00:00:00 2001 From: jack-rabbit <376168706@qq.com> Date: Wed, 12 Jun 2019 13:54:49 +0800 Subject: [PATCH] 1.英文翻译（4） --- WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp | 2 +- WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp | 2 +- WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp | 4 ++-- WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp | 4 ++-- WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp | 4 ++-- WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp | 2 +- WebRoot/WEB-INF/tld/elfun.tld | 8 ++++++++ resources/mybatis1/sunvote/GradeMapper.xml | 2 +- src/com/fh/controller/sunvote/Myelfun.java | 18 ++++++++++++++++++ src/com/fh/controller/sunvote/paper/PaperController.java | 1 + 10 files changed, 37 insertions(+), 10 deletions(-) diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp index 22a91dd..c9dc4c6 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp @@ -73,7 +73,7 @@ ${vs.index+1} ${var.NAME} ${var.CLASS_NAME} - ${var.CNAME} + ${var.ENAME} diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp index 5e0934d..0044812 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp @@ -66,7 +66,7 @@ ${vs.index+1} - ${var.NAME} + ${var.ENAME} ${var.DESC} diff --git a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp index b0753ea..22d66d4 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp @@ -76,8 +76,8 @@ ${vs.index+1} ${var.NAME} - ${myelfun:findSubjectCName(var.SUBJECT_ID)} - ${myelfun:findGradeName(var.GRADE_ID)} + ${myelfun:findSubjectEName(var.SUBJECT_ID)} + ${myelfun:findGradeEName(var.GRADE_ID)} ${var.PAGE_SCORE} diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp index 93d5944..42981ef 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp @@ -116,8 +116,8 @@ value="${var.PAPER_ID}" />${vs.index+1} ${var.TITLE} - ${myelfun:findGradeName(var.GRADE_ID)} - ${myelfun:findSubjectCName(var.SUBJECT_ID)} + ${myelfun:findGradeEName(var.GRADE_ID)} + ${myelfun:findSubjectEName(var.SUBJECT_ID)} ${myelfun:findTeacherName(var.USER_ID)} ${var.CREATE_DATE} ${var.EXAM_TIME} diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp index 36c8a2d..ac93edb 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp @@ -95,8 +95,8 @@ ${vs.index+1} ${var.TITLE} ${var.CREATE_DATE} - ${myelfun:findGradeName(var.GRADE_ID)} - ${myelfun:findSubjectCName(var.SUBJECT_ID)} + ${myelfun:findGradeEName(var.GRADE_ID)} + ${myelfun:findSubjectEName(var.SUBJECT_ID)} ${var.EXAM_TIME} ${var.SCORE} diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp index da4aa54..7f8bb80 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp @@ -94,7 +94,7 @@ ${var.ACCOUT} ${var.SEX == 1? "male":"female"} ${var.KEYPAD_ID} - ${myelfun:findSubjectCName(var.SUBJECT_IDS)} + ${myelfun:findSubjectEName(var.SUBJECT_IDS)} diff --git a/WebRoot/WEB-INF/tld/elfun.tld b/WebRoot/WEB-INF/tld/elfun.tld index b2ac093..6503a79 100644 --- a/WebRoot/WEB-INF/tld/elfun.tld +++ b/WebRoot/WEB-INF/tld/elfun.tld @@ -25,6 +25,14 @@ + 根据ID获取年级名称 + findGradeEName + com.fh.controller.sunvote.Myelfun + java.lang.String findGradeEName(java.lang.String) + ${myelfun:findGradeEName(obj1)} + + + 根据ID获取班级类型名称 findClassTypeName com.fh.controller.sunvote.Myelfun diff --git a/resources/mybatis1/sunvote/GradeMapper.xml b/resources/mybatis1/sunvote/GradeMapper.xml index 6abf039..68e6bda 100644 --- a/resources/mybatis1/sunvote/GradeMapper.xml +++ b/resources/mybatis1/sunvote/GradeMapper.xml @@ -9,7 +9,7 @@ - SV_GRADE.NAME,SV_GRADE.DESC,REMARK,ID + SV_GRADE.NAME,SV_GRADE.ENAME,SV_GRADE.DESC,REMARK,ID diff --git a/src/com/fh/controller/sunvote/Myelfun.java b/src/com/fh/controller/sunvote/Myelfun.java index 3b063f4..1e19e6c 100644 --- a/src/com/fh/controller/sunvote/Myelfun.java +++ b/src/com/fh/controller/sunvote/Myelfun.java @@ -61,6 +61,24 @@ public class Myelfun { } /** + * 根据ID获取年级名称 + * @param type + * @return + * @throws Exception + */ + public static String findGradeEName(String type) throws Exception{ + GradeService gradeService = (GradeService)SpringBeanFactoryUtils.getBean("gradeService"); + PageData pageData = new PageData(); + pageData.put("ID", type); + pageData = gradeService.findById(pageData); + if(pageData != null){ + return pageData.getString("ENAME"); + }else{ + return "" ; + } + } + + /** * 根据ID或者班级类型名称 * @param type * @return diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java index 4b7183b..563e27d 100644 --- a/src/com/fh/controller/sunvote/paper/PaperController.java +++ b/src/com/fh/controller/sunvote/paper/PaperController.java @@ -379,6 +379,7 @@ public class PaperController extends BaseController { } pd.put("PAPER_TYPE","1"); page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = paperService.list(page); //列出Paper列表 // pd.put("PAPER_TYPE","2"); // List varList2 = paperService.list(page); //列出Paper列表 -- libgit2 0.21.4