Merge remote-tracking branch 'origin/master'

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

@@ -52,4 +52,7 @@ public class ResumeDeliverHrDTO {
 
     @ApiModelProperty(value = "工作经历")
     private List<ResumeWorkExperience> resumeWorkExperienceList;
+
+    @ApiModelProperty(value = "简历ID")
+    private String resumeId;
 }

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/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

@@ -171,6 +171,7 @@ public class ResumeApiController {
             rd.setDelFlag(false);
             rd.setJobRecruitmentId(recruitmentId);
             rd.setJobUserId(subject);
+            rd.setJobResumeId(resumeId);
             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);
@@ -195,7 +194,7 @@ public class UserBrowseHrApiController {
             dto.setWorkExp(workExpName);
             dto.setEducation(educationName);
             dto.setDreamMoney(dreamMoneyName);
-
+            dto.setResumeId(resume.getId());
 
             pageDto.add(dto);
         }