|
@@ -2,14 +2,18 @@ package com.jpsoft.employment.modules.mobile.controller;
|
|
|
|
|
|
|
|
import com.github.pagehelper.Page;
|
|
import com.github.pagehelper.Page;
|
|
|
import com.jpsoft.employment.modules.base.entity.LabourServices;
|
|
import com.jpsoft.employment.modules.base.entity.LabourServices;
|
|
|
|
|
+import com.jpsoft.employment.modules.base.service.CompanyService;
|
|
|
import com.jpsoft.employment.modules.base.service.LabourServicesService;
|
|
import com.jpsoft.employment.modules.base.service.LabourServicesService;
|
|
|
import com.jpsoft.employment.modules.common.dto.MessageResult;
|
|
import com.jpsoft.employment.modules.common.dto.MessageResult;
|
|
|
import com.jpsoft.employment.modules.common.dto.Sort;
|
|
import com.jpsoft.employment.modules.common.dto.Sort;
|
|
|
|
|
+import com.jpsoft.employment.modules.common.utils.MapUtils;
|
|
|
import com.jpsoft.employment.modules.common.utils.PojoUtils;
|
|
import com.jpsoft.employment.modules.common.utils.PojoUtils;
|
|
|
import com.jpsoft.employment.modules.sys.entity.User;
|
|
import com.jpsoft.employment.modules.sys.entity.User;
|
|
|
import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
|
|
import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
|
|
|
import com.jpsoft.employment.modules.sys.service.UserService;
|
|
import com.jpsoft.employment.modules.sys.service.UserService;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
|
|
+import io.swagger.annotations.ApiImplicitParam;
|
|
|
|
|
+import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -36,6 +40,9 @@ public class LabourApiController {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private UserService userService;
|
|
private UserService userService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private CompanyService companyService;
|
|
|
|
|
+
|
|
|
@PostMapping("getLabourList")
|
|
@PostMapping("getLabourList")
|
|
|
@ApiOperation(value = "劳务对接列表")
|
|
@ApiOperation(value = "劳务对接列表")
|
|
|
public MessageResult<Map> getLabourList(
|
|
public MessageResult<Map> getLabourList(
|
|
@@ -74,6 +81,7 @@ public class LabourApiController {
|
|
|
searchParams.put("endTime", endTime);
|
|
searchParams.put("endTime", endTime);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
Page<LabourServices> page = labourServicesService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
|
|
Page<LabourServices> page = labourServicesService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
|
|
|
|
|
|
|
|
for (LabourServices labourServices:page) {
|
|
for (LabourServices labourServices:page) {
|