Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/employment/modules/job/controller/ResumeController.java

@@ -77,7 +77,7 @@ public class ResumeController {
             //数据填充
             List<ResumeWorkExperience> workList = resumeWorkExperienceService.findByResumeId(resume.getId());
             List<ResumeEducationExperience> educationList = resumeEducationExperienceService.findByResumeId(resume.getId());
-            resume.setSexName(dataDictionaryService.getName(resume.getSex()));
+            resume.setSexName(dataDictionaryService.findNameByCatalogNameAndValue("性别",resume.getSex()));
             resume.setJobStatusName(dataDictionaryService.getName(resume.getJobStatus()));
             resume.setJobStatusName(dataDictionaryService.getName(resume.getJobStatus()));
             resume.setUserAge(String.valueOf(getAge(resume.getBirthday())));
@@ -232,7 +232,7 @@ public class ResumeController {
         for(Resume resume : page.getResult()){
             WorkCategory workCategory = workCategoryService.get(resume.getPositionCategoryId());
             if(workCategory != null) resume.setPositionCategoryName(workCategory.getName());
-            resume.setSexName(dataDictionaryService.getName(resume.getSex()));
+            resume.setSexName(dataDictionaryService.findNameByCatalogNameAndValue("性别",resume.getSex()));
             resume.setDreamMoneyName(dataDictionaryService.getName(resume.getDreamMoney()));
             resume.setWorkExpName(dataDictionaryService.getName(resume.getWorkExp()));
             resume.setEducationName(dataDictionaryService.getName(resume.getEducation()));

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/ResumeApiController.java

@@ -262,6 +262,22 @@ public class ResumeApiController {
                 return messageResult;
             }
 
+            JobUser jobUser = jobUserService.get(resume.getJobUserId());
+            if(jobUser != null) {
+                resume.setUserName(jobUser.getRealName());
+            }
+            resume.setSexName(dataDictionaryService.findNameByCatalogNameAndValue("性别",resume.getSex()));
+            resume.setDreamMoneyName(dataDictionaryService.getName(resume.getDreamMoney()));
+            resume.setWorkExpName(dataDictionaryService.getName(resume.getWorkExp()));
+            resume.setEducationName(dataDictionaryService.getName(resume.getEducation()));
+            resume.setJobStatusName(dataDictionaryService.getName(resume.getJobStatus()));
+            resume.setPositionCategoryName(dataDictionaryService.getName(resume.getPositionCategoryId()));
+            if(resume.getUserIsAuthentication() == "1")
+                resume.setUserIsAuthenticationName("已实名");
+            else
+                resume.setUserIsAuthenticationName("未实名");
+            resume.setStatusName(dataDictionaryService.getName(resume.getStatus()));
+
             //教育经验
             List<ResumeEducationExperience> rexList = resumeEducationExperienceService.findByResumeId(resume.getId());
             //工作经验