BUG修改

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

@@ -538,6 +538,20 @@ public class RecruitmentApiController {
         searchParams.put("approveStatus", 3);
 
         Page<Recruitment> page = recruitmentService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(Recruitment recruitment : page.getResult()){
+            Company company = companyService.get(recruitment.getCompanyId());
+            if(company != null){
+                recruitment.setCompanyName(company.getName());
+                String scaleName = dataDictionaryService.getName(company.getScale());
+                recruitment.setCompanyScaleN(scaleName);
+                String industryN = dataDictionaryService.getName(company.getIndustry());
+                recruitment.setCompanyIndustryN(industryN);
+
+                recruitment.setWorkYearName(dataDictionaryService.getName(recruitment.getWorkYear()));
+                recruitment.setEducationName(dataDictionaryService.getName(recruitment.getEducation()));
+                recruitment.setWageTypeName(dataDictionaryService.getName(recruitment.getWageType()));
+            }
+        }
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));

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

@@ -325,8 +325,9 @@ public class ResumeApiController {
             }
             resume.setUserIsAuthenticationName(dataDictionaryService.findNameByCatalogNameAndValue("实名制状态",resume.getUserIsAuthentication()));
             resume.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("简历状态",resume.getStatus()));
+            resume.setDreamAddName(dataDictionaryService.findNameByCatalogNameAndValue("期望工作地",resume.getDreamAdd()));
 
-            //教育经验
+            //教育经验l
             List<ResumeEducationExperience> rexList = resumeEducationExperienceService.findByResumeId(resume.getId());
             //工作经验
             List<ResumeWorkExperience> rweList = resumeWorkExperienceService.findByResumeId(resume.getId());
@@ -457,7 +458,7 @@ public class ResumeApiController {
             @DateTimeFormat(pattern = "yyyy-MM-dd") Date birthday,
             @RequestParam(value="dreamAdd",defaultValue="") String dreamAdd,
             @RequestParam(value="introduction",defaultValue="") String introduction,
-            @RequestParam(value="status",defaultValue="0") String status,
+            @RequestParam(value="status",defaultValue="1") String status,
             @RequestParam(value="expJson",defaultValue="") String expJson,
             @RequestParam(value="resumeUrls",defaultValue="") String resumeUrls,
             String token,