Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/job/dto/JobUserDTO.java

@@ -18,4 +18,7 @@ public class JobUserDTO {
     @ApiModelProperty(value = "入职工作地")
     private String area;
 
+    //只做显示作用不保存数据库
+    private String resumeDeliverId;
+
 }

common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverDTO.java

@@ -53,6 +53,9 @@ public class ResumeDeliverDTO {
     @ApiModelProperty(value = "沟通状态")
     private String chatStatusN;
 
+    @ApiModelProperty(value = "附件,逗号分割")
+    private String resumeUrls;
+
 
     private List<DataDictionary> chatStatusList;
 }

common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverHrDTO.java

@@ -55,4 +55,13 @@ public class ResumeDeliverHrDTO {
 
     @ApiModelProperty(value = "简历ID")
     private String resumeId;
+
+    @ApiModelProperty(value = "附件,逗号分割")
+    private String resumeUrls;
+
+    @ApiModelProperty(value = "期望工作地")
+    private String dreamAdd;
+
+    @ApiModelProperty(value = "工作状态")
+    private String jobStatus;
 }

common/src/main/resources/mapper/job/Recruitment.xml

@@ -231,6 +231,7 @@
 			LEFT JOIN sys_data_dictionary AS sdda ON bc.scale_ = sdda.id_
 			LEFT JOIN sys_data_dictionary AS sddb ON jr.wage_type = sddb.id_
 			LEFT JOIN sys_data_dictionary AS sddc ON bc.industry_ = sddc.id_
+			LEFT JOIN sys_data_dictionary AS sddd ON jr.work_year = sddd.id_
 			LEFT JOIN base_city AS bci ON jr.area_ = bci.id_
 		]]>
 		<where>

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

@@ -247,6 +247,8 @@ public class ResumeDeliverController {
 
                 JobUserDTO dto = new JobUserDTO();
 
+                dto.setResumeDeliverId(id);
+
                 if(jobUser!=null) {
                     dto.setRealName(jobUser.getRealName());
                     dto.setIdCard(jobUser.getIdCard());
@@ -416,6 +418,8 @@ public class ResumeDeliverController {
                 dto.setBirthday(resume.getBirthday());
                 dto.setJobStatus(resume.getJobStatus());
 
+                dto.setResumeUrls(resume.getResumeUrls());
+
             }
 
             dto.setChatStatus(resumeDeliver.getChatStatus());
@@ -721,6 +725,7 @@ public class ResumeDeliverController {
             JobUser jobUser = jobUserService.get(resumeDeliver.getJobUserId());
 
             if(jobUser!=null){
+                dto.setJobUserId(jobUser.getId());
                 dto.setHeadImageUrl(jobUser.getHeadImageUrl());
                 dto.setName(jobUser.getRealName());
                 dto.setSexN(jobUser.getSex());
@@ -736,6 +741,7 @@ public class ResumeDeliverController {
             String workExpName="";
             String dreamMoneyName="";
             String educationName="";
+            String resumeUrls="";
 
             if(resume!=null){
                 DataDictionary dataDictionary = dataDictionaryService.get(resume.getWorkExp());
@@ -760,11 +766,15 @@ public class ResumeDeliverController {
 
                 dto.setResumeWorkExperienceList(resumeWorkExperienceList);
                 dto.setUserTel(resume.getUserTel());
+
+                resumeUrls = resume.getResumeUrls();
+
             }
 
             dto.setWorkExp(workExpName);
             dto.setEducation(educationName);
             dto.setDreamMoney(dreamMoneyName);
+            dto.setResumeUrls(resumeUrls);
 
 
             pageDto.add(dto);

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

@@ -256,7 +256,6 @@ public class RecruitmentApiController {
             map.put("recruitment",recruitment);
             map.put("collectionStatus",collectionStatus);
             map.put("deliveryStatus",deliveryStatus);
-            map.put("deliveryStatus",deliveryStatus);
             map.put("recommendPosition",page.getResult());
 
 

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

@@ -156,7 +156,7 @@ public class ResumeApiController {
                     return messageResult;
                 }
 
-                if(!"2".equals(resume.getApproveStatus())){
+                if(!"3".equals(resume.getApproveStatus())){
                     messageResult.setMessage("当前简历未审批");
                     messageResult.setResult(false);
                     messageResult.setCode(400);
@@ -171,6 +171,7 @@ public class ResumeApiController {
             rd.setDelFlag(false);
             rd.setJobRecruitmentId(recruitmentId);
             rd.setJobUserId(subject);
+            rd.setJobResumeId(resume.getId());
             rd.setStatus("0");
             rd.setChatStatus("1");
 

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

@@ -26,7 +26,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/mobile/userBrowseApi")
+@RequestMapping("/mobile/userBrowseHrApi")
 @Api(tags = "移动端接口：招聘方[浏览记录]")
 @Slf4j
 public class UserBrowseHrApiController {
@@ -58,8 +58,7 @@ public class UserBrowseHrApiController {
             String workExp,String education,String createTimeRange,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            HttpServletRequest request){
-        String subject = (String)request.getAttribute("subject");
+            @RequestAttribute String subject){
 
         //当前用户ID
         System.out.println(subject);
@@ -142,7 +141,7 @@ public class UserBrowseHrApiController {
             String workExpName="";
             String dreamMoneyName="";
             String educationName="";
-//            String positionName = "";
+            String jobStatus = "";
 
 
             if(resume!=null){
@@ -176,7 +175,6 @@ public class UserBrowseHrApiController {
                     dto.setJobUserId(jobUser.getId());
                     dto.setHeadImageUrl(jobUser.getHeadImageUrl());
                     dto.setName(jobUser.getRealName());
-                    dto.setSexN(jobUser.getSex());
                     dto.setUserTel(jobUser.getTel());
 
                     if(StringUtils.isNotEmpty(jobUser.getIdCard())){
@@ -196,6 +194,9 @@ public class UserBrowseHrApiController {
             dto.setEducation(educationName);
             dto.setDreamMoney(dreamMoneyName);
             dto.setResumeId(resume.getId());
+            dto.setDreamAdd(resume.getDreamAdd());
+            dto.setJobStatus(dataDictionaryService.getName(resume.getJobStatus()));
+            dto.setSexN(dataDictionaryService.findNameByCatalogNameAndValue("性别",resume.getSex()));
 
             pageDto.add(dto);
         }