BUG修改

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

@@ -577,50 +577,57 @@ public class ResumeApiController {
             @RequestParam(value="pageSize",defaultValue="10") int pageSize,
             String token,
             @RequestAttribute  String subject){
-
         MessageResult<Map> msgResult = new MessageResult<>();
+        try {
 
-        Map<String,Object> searchParams = new HashMap<>();
+            Map<String, Object> searchParams = new HashMap<>();
 
-        User sysUser = userService.get(subject);
+            User sysUser = userService.get(subject);
 
-        List<Recruitment> recruitmentList = recruitmentService.findByCompanyId(sysUser.getCompanyId());
-        if(recruitmentList.size()>0){
-            searchParams.put("recruitmentList", recruitmentList);
-        }
+            List<Recruitment> recruitmentList = recruitmentService.findByCompanyId(sysUser.getCompanyId());
+            if (recruitmentList.size() > 0) {
+                searchParams.put("recruitmentList", recruitmentList);
+            }
 
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("a.create_time", "desc"));
 
-        searchParams.put("status", 1);
-        searchParams.put("approveStatus", 3);
-        searchParams.put("isAuthentication", 1);//实名制状态
+            searchParams.put("status", 1);
+            searchParams.put("approveStatus", 3);
+            searchParams.put("isAuthentication", 1);//实名制状态
 
-        Page<Resume> page = resumeService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-        for(Resume resume : page.getResult()){
-            JobUser jobUser = jobUserService.get(resume.getJobUserId());
-            resume.setUserName(jobUser.getRealName());
-            resume.setUserTel(jobUser.getTel());
-            resume.setUserPhoto(jobUser.getHeadImageUrl());
-            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()));
-            WorkCategory workCategory = workCategoryService.get(resume.getPositionCategoryId());
-            if(workCategory != null) {
-                resume.setPositionCategoryName(workCategory.getName());
-            }
+            Page<Resume> page = resumeService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
+            for (Resume resume : page.getResult()) {
+                JobUser jobUser = jobUserService.get(resume.getJobUserId());
+                resume.setUserName(jobUser.getRealName());
+                resume.setUserTel(jobUser.getTel());
+                resume.setUserPhoto(jobUser.getHeadImageUrl());
+                resume.setUserAddress(jobUser.getAddress());
+                resume.setUserAge(String.valueOf(getAge(jobUser.getBirthday())));
+                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()));
+                WorkCategory workCategory = workCategoryService.get(resume.getPositionCategoryId());
+                if (workCategory != null) {
+                    resume.setPositionCategoryName(workCategory.getName());
+                }
 //            City city = cityService.get(Integer.parseInt(resume.getDreamAdd()));
 //            if(city != null){
 //                resume.setDreamAddName(city.getCityName());
 //            }
-            resume.setDreamAddName(dataDictionaryService.findNameByCatalogNameAndValue("期望工作地",resume.getDreamAdd()));
-            //resume.setUserIsAuthenticationName(dataDictionaryService.findNameByCatalogNameAndValue("实名制状态",resume.getUserIsAuthentication()));
-            //resume.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("简历状态",resume.getStatus()));
+                resume.setDreamAddName(dataDictionaryService.findNameByCatalogNameAndValue("期望工作地", resume.getDreamAdd()));
+                //resume.setUserIsAuthenticationName(dataDictionaryService.findNameByCatalogNameAndValue("实名制状态",resume.getUserIsAuthentication()));
+                //resume.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("简历状态",resume.getStatus()));
+            }
+            msgResult.setResult(true);
+            msgResult.setData(PojoUtils.pageWrapper(page));
+        }catch (Exception e){
+            e.printStackTrace();
+            msgResult.setResult(false);
+            msgResult.setMessage(e.getMessage());
         }
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
 
         return msgResult;
     }
@@ -717,6 +724,32 @@ public class ResumeApiController {
         return updateCount;
     }
 
+    private int getAge(Date birthDay) throws Exception {
+        Calendar cal = Calendar.getInstance();
+        if (cal.before(birthDay)) {
+            throw new IllegalArgumentException("The birthDay is before Now.It's unbelievable!");
+        }
+        int yearNow = cal.get(Calendar.YEAR);
+        int monthNow = cal.get(Calendar.MONTH);
+        int dayOfMonthNow = cal.get(Calendar.DAY_OF_MONTH);
+        cal.setTime(birthDay);
+
+        int yearBirth = cal.get(Calendar.YEAR);
+        int monthBirth = cal.get(Calendar.MONTH);
+        int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH);
+
+        int age = yearNow - yearBirth;
+
+        if (monthNow <= monthBirth) {
+            if (monthNow == monthBirth) {
+                if (dayOfMonthNow < dayOfMonthBirth) age--;
+            }else{
+                age--;
+            }
+        }
+        return age;
+    }
+
     public static void main(String[] args) {
         String workExpJson = "{\"workExp\":[{\"id\":\"123\",\"name\":\"标题一\",\"timeS\":\"2020\",\"timeE\":\"2021\",\"remark\":\"工作1\",\"content\":\"内容\"},{\"id\":\"223\",\"name\":\"标题二\",\"timeS\":\"2022\",\"timeE\":\"至今\",\"remark\":\"工作2\",\"content\":\"内容2\"}],\"educationExp\":[{\"id\":\"323\",\"name\":\"标题一\",\"timeS\":\"2025\",\"timeE\":\"2026\",\"remark\":\"教育1\",\"content\":\"内容1\"},{\"id\":\"423\",\"name\":\"标题一\",\"timeS\":\"1\",\"timeE\":\"2\",\"remark\":\"教育2\",\"content\":\"内容2\"}]}";