Merge remote-tracking branch 'origin/master'

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

@@ -105,19 +105,19 @@ public class HrIndexController {
             List<Map<String,Object>> list = new ArrayList<>();
 
             Map<String,Object> map = new HashMap<>();
-            map.put("name","recruitmentNum");
+            map.put("name","职位展现");
             map.put("value",recruitmentNum);
 
             list.add(map);
 
             Map<String,Object> map1 = new HashMap<>();
-            map1.put("name","userBrowseNum");
+            map1.put("name","职位点击");
             map1.put("value",userBrowseNum);
 
             list.add(map1);
 
             Map<String,Object> map2 = new HashMap<>();
-            map2.put("name","resumeDeliverNum");
+            map2.put("name","职位投递");
             map2.put("value",resumeDeliverNum);
 
             list.add(map2);

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

@@ -363,8 +363,8 @@ public class JobUserController {
 
         String sexN ="";
 
-        if(StringUtils.isNotEmpty(jobUser.getSex())){
-            sexN = dataDictionaryService.getName(resume.getSex());
+        if(StringUtils.isNotEmpty(resume.getSex())){
+            sexN = dataDictionaryService.findNameByCatalogNameAndValue("性别",resume.getSex());
         }
         dto.setSexN(sexN);
 
@@ -373,14 +373,14 @@ public class JobUserController {
         if(StringUtils.isNotEmpty(jobUser.getIdCard())){
             age = IdcardUtil.getAgeByIdCard(jobUser.getIdCard());
         }
+        String birthday="";
 
+        if(resume.getBirthday()!=null){
+            birthday = sdf.format(resume.getBirthday());
+        }
         dto.setAge(age);
 
-        String birthday="";
 
-        if(jobUser.getBirthday()!=null){
-            birthday = sdf.format(jobUser.getBirthday());
-        }
         dto.setBirthday(birthday);
 
         String positionCategoryName="";
@@ -407,7 +407,7 @@ public class JobUserController {
             workExpName = dataDictionary.getName();
         }
         dto.setWorkExpName(workExpName);
-        dto.setTel(resume.getUserTel());
+        dto.setTel(jobUser.getTel());
         dto.setAddress(jobUser.getAddress());
         dto.setCurCompany("");
 

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

@@ -297,7 +297,7 @@ public class RecruitmentApiController {
         Recruitment recruitment = recruitmentService.get(id);//id 数据
         String relevantTitle = recruitment.getTitle();//标题
 
-        sortList.add(new Sort("jr.id_","asc"));
+        sortList.add(new Sort("jr.create_time","desc"));
 
         searchParams.put("relevantTitle", "%"+relevantTitle+"%");
         searchParams.put("notrelevantId", id);
@@ -325,7 +325,7 @@ public class RecruitmentApiController {
 
         List<Sort> sortList = new ArrayList<>();
 
-        sortList.add(new Sort("bc.id_","asc"));
+        sortList.add(new Sort("jr.create_time","desc"));
 
         if (StringUtils.isNotEmpty(id)) {
             searchParams.put("id", "%"+id+"%");