|
|
@@ -4,7 +4,9 @@ import com.github.pagehelper.Page;
|
|
|
import com.jpsoft.employment.modules.common.dto.MessageResult;
|
|
|
import com.jpsoft.employment.modules.common.dto.Sort;
|
|
|
import com.jpsoft.employment.modules.common.utils.PojoUtils;
|
|
|
+import com.jpsoft.employment.modules.job.entity.ResumeDeliver;
|
|
|
import com.jpsoft.employment.modules.job.entity.ResumeWorkExperience;
|
|
|
+import com.jpsoft.employment.modules.job.service.ResumeDeliverService;
|
|
|
import com.jpsoft.employment.modules.job.service.ResumeWorkExperienceService;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
@@ -25,6 +27,9 @@ public class ResumeWorkExperienceController {
|
|
|
@Autowired
|
|
|
private ResumeWorkExperienceService resumeWorkExperienceService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ResumeDeliverService resumeDeliverService;
|
|
|
+
|
|
|
@ApiOperation(value="添加信息")
|
|
|
@PostMapping("add")
|
|
|
public MessageResult<ResumeWorkExperience> add(@ModelAttribute ResumeWorkExperience resumeWorkExperience){
|
|
|
@@ -143,9 +148,9 @@ public class ResumeWorkExperienceController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value="列表")
|
|
|
- @RequestMapping(value = "list",method = RequestMethod.POST)
|
|
|
- public MessageResult<Map> list(
|
|
|
- String id,
|
|
|
+ @RequestMapping(value = "pageList",method = RequestMethod.POST)
|
|
|
+ public MessageResult<Map> pageList(
|
|
|
+ String resumeDeliverId,
|
|
|
@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
|
|
|
@RequestParam(value="pageSize",defaultValue="20") int pageSize,
|
|
|
HttpServletRequest request){
|
|
|
@@ -159,10 +164,18 @@ public class ResumeWorkExperienceController {
|
|
|
Map<String,Object> searchParams = new HashMap<>();
|
|
|
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
|
- sortList.add(new Sort("id_","asc"));
|
|
|
+ sortList.add(new Sort("sort_no","desc"));
|
|
|
+
|
|
|
+ ResumeDeliver resumeDeliver = resumeDeliverService.get(resumeDeliverId);
|
|
|
+
|
|
|
+ String resumeId="";
|
|
|
+
|
|
|
+ if(resumeDeliver!=null){
|
|
|
+ resumeId = resumeDeliver.getJobResumeId();
|
|
|
+ }
|
|
|
|
|
|
- if (StringUtils.isNotEmpty(id)) {
|
|
|
- searchParams.put("id","%" + id + "%");
|
|
|
+ if (StringUtils.isNotEmpty(resumeId)) {
|
|
|
+ searchParams.put("resumeId",resumeId);
|
|
|
}
|
|
|
|
|
|
|