Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/ResumeDeliverRecordServiceImpl.java

@@ -128,10 +128,11 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 
 				if(company!=null){
 					companyName = company.getName();
-				}
+					if(StringUtils.isEmpty(model.getCompanyPhone())){
+						model.setCompanyPhone(company.getTel());
+					}
 
-				position = resumeDeliverContent.getEntryPost();
-				positionDep = resumeDeliverContent.getEntryDepartment();
+				}
 				workAddress = recruitment.getAddress();
 			}
 			if(resume!=null){
@@ -140,6 +141,7 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				if(jobUser!=null){
 					jobUserName = jobUser.getRealName();
 					idCard = jobUser.getIdCard();
+					model.setJobUserId(jobUser.getId());
 				}
 			}
 
@@ -153,6 +155,10 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				userName = model.getRealName();
 				tel = model.getCompanyPhone();
 
+				if(StringUtils.isEmpty(model.getJobUserId())){
+					model.setJobUserId(resumeDeliver.getJobUserId());
+				}
+
 				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);
 			}
@@ -162,13 +168,17 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				userName = model.getRealName();
 				tel = model.getCompanyPhone();
 
+
 				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);
 
 			}
 			else if(chatType.equals("4")){
-				resumeDeliverContent.setEntryPost(model.getEntryPosition());
-				resumeDeliverContent.setEntryDepartment(model.getEntryDepartment());
+				position = model.getEntryPosition();
+				positionDep = model.getEntryDepartment();
+				resumeDeliverContent.setEntryPost(position);
+				resumeDeliverContent.setEntryDepartment(positionDep);
+				tel = model.getCompanyPhone();
 
 				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);

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

@@ -176,7 +176,6 @@ public class ResumeDeliverController {
 
                     resumeDeliverRecord.setRemark("录用人：" + jobUser.getRealName() + "，身份证号：" + jobUser.getIdCard() + "，入职公司：" + company.getName() + "，入职岗位：" + entryPosition + "，入职部门：" + entryDepartment + "，工作地点：" + recruitment.getArea());
 
-
                     resumeDeliverRecord.setEntryPosition(entryPosition);
                     resumeDeliverRecord.setEntryDepartment(entryDepartment);
                     resumeDeliverRecord.setJobUserId(jobUser.getId());

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

@@ -245,6 +245,12 @@ public class MessageNoticeApiController {
             mc.setCreateByN(createUser.getRealName());
 
             Company company = companyService.get(createUser.getCompanyId());
+            if(company != null){
+                String scaleName = dataDictionaryService.getName(company.getScale());
+                company.setScaleName(scaleName);
+                String industryN = dataDictionaryService.getName(company.getIndustry());
+                company.setIndustryName(industryN);
+            }
 
             MessageRead messageRead = messageReadService.findByMIdAndUserId(mc.getId(),subject);
             Boolean isNeedAgree = false;

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

@@ -538,6 +538,21 @@ 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.setCompanyLogo(company.getLogo());
+
+                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,
@@ -576,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;
     }
@@ -716,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\"}]}";