Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/base/entity/City.java

@@ -24,4 +24,5 @@ public class City {
     private Integer type;
         @ApiModelProperty(value = "")
     private Integer pid;
+    private String parentId;
 }

common/src/main/java/com/jpsoft/employment/modules/job/entity/Recruitment.java

@@ -4,102 +4,80 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
 
 /**
   描述:job_recruitment的实体类
  */
 @Data
+@ApiModel(value = "job_recruitment的实体类")
 public class Recruitment {
-
-	@ApiModelProperty(value = "ID")
-	private String id;
-
-	@ApiModelProperty(value = "企业ID")
-	private String companyId;
-
-	@ApiModelProperty(value = "标题")
-	private String title;
-
-	@ApiModelProperty(value = "招聘所属地区")
-	private String area;
-
-	@ApiModelProperty(value = "地址")
-	private String address;
-
-	@ApiModelProperty(value = "职位")
-	private String position;
-
-	@ApiModelProperty(value = "职位描述")
-	private String positionMessage;
-
-	@ApiModelProperty(value = "任职要求")
-	private String requirements;
-
-
-	@ApiModelProperty(value = "求职人数")
-	private Integer positionNumber;
-
-	@ApiModelProperty(value = "工作年限")
-	private String workYear;
-
-	@ApiModelProperty(value = "学历要求")
-	private String education;
-
-	@ApiModelProperty(value = "性别要求")
-	private String positionSex;
-
-	@ApiModelProperty(value = "性别要求")
-	private Integer readTimes;
-
-	@ApiModelProperty(value = "薪资")
-	private String wageType;
-
-	@ApiModelProperty(value = "是否面议")
-	private Boolean isDiscussPersonally;
-
-	@ApiModelProperty(value = "联系人")
-	private String contactPerson;
-
-	@ApiModelProperty(value = "联系方式")
-	private String tel;
-
-	@ApiModelProperty(value = "状态(关闭,开启等)")
-	private String status;
-
-	@ApiModelProperty(value = "审批状态")
-	private String approveStatus;
-
-	@ApiModelProperty(value = "阅读次数")
-	private Integer readingTimes;
-
-	@ApiModelProperty(value = "收藏次数")
-	private Integer collectionTimes;
-
-	@ApiModelProperty(value = "投递次数")
-	private Integer deliveryTimes;
-
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-	@ApiModelProperty(value = "是否删除")
-	private Boolean delFlag;
-
+        @ApiModelProperty(value = "")
+    private String id;
+        @ApiModelProperty(value = "企业ID ")
+    private String companyId;
+    private String companyName;
+        @ApiModelProperty(value = "标题")
+    private String title;
+        @ApiModelProperty(value = "招聘所属地区")
+    private String area;
+        @ApiModelProperty(value = "地址")
+    private String address;
+        @ApiModelProperty(value = "职位")
+    private String position;
+        @ApiModelProperty(value = "职位描述")
+    private String positionMessage;
+        @ApiModelProperty(value = "任职要求")
+    private String requirements;
+        @ApiModelProperty(value = "求职人数")
+    private Integer positionNumber;
+        @ApiModelProperty(value = "工作年限")
+    private String workYear;
+    private String workYearName;
+        @ApiModelProperty(value = "学历要求")
+    private String education;
+    private String educationName;
+        @ApiModelProperty(value = "性别要求")
+    private String positionSex;
+        @ApiModelProperty(value = "")
+    private Integer readTimes;
+        @ApiModelProperty(value = "薪资")
+    private String wageType;
+    private String wageTypeName;
+        @ApiModelProperty(value = "是否面议")
+    private Boolean isDiscussPersonally;
+        @ApiModelProperty(value = "联系人")
+    private String contactPerson;
+        @ApiModelProperty(value = "联系方式")
+    private String tel;
+        @ApiModelProperty(value = "状态(关闭,开启等)")
+    private String status;
+        @ApiModelProperty(value = "审批状态")
+    private String approveStatus;
+        @ApiModelProperty(value = "阅读次数")
+    private Integer readingTimes;
+        @ApiModelProperty(value = "收藏次数")
+    private Integer collectionTimes;
+        @ApiModelProperty(value = "投递次数")
+    private Integer deliveryTimes;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date updateTime;
+        @ApiModelProperty(value = "删除标示")
+    private Boolean delFlag;
+    @ApiModelProperty(value = "岗位分类ID")
+    private String workCategoryId;
 }

common/src/main/resources/mapper/base/City.xml

@@ -60,8 +60,11 @@ id_,city_name,type_,pid_		from base_city where id_=#{0}
 			select * from base_city
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.type != null">
+				and type_ = #{searchParams.type}
+			</if>
+			<if test="searchParams.pid != null">
+				and pid_ = #{searchParams.pid}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -5,33 +5,34 @@
 <mapper namespace="com.jpsoft.employment.modules.job.dao.RecruitmentDAO">
 	<resultMap id="RecruitmentMap" type="com.jpsoft.employment.modules.job.entity.Recruitment">
 		<id property="id" column="id_" />
-			<result property="companyId" column="company_id" />
-			<result property="title" column="title_" />
-			<result property="area" column="area_" />
-			<result property="address" column="address_" />
-			<result property="position" column="position_" />
-			<result property="positionMessage" column="position_message" />
-			<result property="requirements" column="requirements_" />
-			<result property="positionNumber" column="position_number" />
-			<result property="workYear" column="work_year" />
-			<result property="education" column="education_" />
-			<result property="positionSex" column="position_sex" />
-			<result property="readTimes" column="read_times" />
-			<result property="wageType" column="wage_type" />
-			<result property="isDiscussPersonally" column="is_discuss_personally" />
-			<result property="contactPerson" column="contact_person" />
-			<result property="tel" column="tel_" />
-			<result property="status" column="status_" />
-			<result property="approveStatus" column="approve_status" />
-			<result property="readingTimes" column="reading_times" />
-			<result property="collectionTimes" column="collection_times" />
-			<result property="deliveryTimes" column="delivery_times" />
-			<result property="createBy" column="create_by" />
-			<result property="createTime" column="create_time" />
-			<result property="updateBy" column="update_by" />
-			<result property="updateTime" column="update_time" />
-			<result property="delFlag" column="del_flag" />
-			</resultMap>
+		<result property="companyId" column="company_id" />
+		<result property="title" column="title_" />
+		<result property="area" column="area_" />
+		<result property="address" column="address_" />
+		<result property="position" column="position_" />
+		<result property="positionMessage" column="position_message" />
+		<result property="requirements" column="requirements_" />
+		<result property="positionNumber" column="position_number" />
+		<result property="workYear" column="work_year" />
+		<result property="education" column="education_" />
+		<result property="positionSex" column="position_sex" />
+		<result property="readTimes" column="read_times" />
+		<result property="wageType" column="wage_type" />
+		<result property="isDiscussPersonally" column="is_discuss_personally" />
+		<result property="contactPerson" column="contact_person" />
+		<result property="tel" column="tel_" />
+		<result property="status" column="status_" />
+		<result property="approveStatus" column="approve_status" />
+		<result property="readingTimes" column="reading_times" />
+		<result property="collectionTimes" column="collection_times" />
+		<result property="deliveryTimes" column="delivery_times" />
+		<result property="createBy" column="create_by" />
+		<result property="createTime" column="create_time" />
+		<result property="updateBy" column="update_by" />
+		<result property="updateTime" column="update_time" />
+		<result property="delFlag" column="del_flag" />
+		<result property="workCategoryId" column="work_category_id" />
+	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.job.entity.Recruitment">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -40,7 +41,7 @@
 	-->
 	<![CDATA[
 		insert into job_recruitment
-	    (id_,company_id,title_,area_,address_,position_,position_message,requirements_,position_number,work_year,education_,position_sex,read_times,wage_type,is_discuss_personally,contact_person,tel_,status_,approve_status,reading_times,collection_times,delivery_times,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,company_id,title_,area_,address_,position_,position_message,requirements_,position_number,work_year,education_,position_sex,read_times,wage_type,is_discuss_personally,contact_person,tel_,status_,approve_status,reading_times,collection_times,delivery_times,create_by,create_time,update_by,update_time,del_flag,work_category_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -70,6 +71,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{workCategoryId,jdbcType= VARCHAR }
 		)
 	]]>
 	</insert>
@@ -157,11 +159,15 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="workCategoryId!=null">
+				work_category_id=#{workCategoryId,jdbcType= VARCHAR },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="RecruitmentMap">
-		select * from job_recruitment where id_=#{0}
+		select 
+id_,company_id,title_,area_,address_,position_,position_message,requirements_,position_number,work_year,education_,position_sex,read_times,wage_type,is_discuss_personally,contact_person,tel_,status_,approve_status,reading_times,collection_times,delivery_times,create_by,create_time,update_by,update_time,del_flag,work_category_id		from job_recruitment where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from job_recruitment where id_=#{0}
@@ -174,10 +180,15 @@
 			select * from job_recruitment
 		]]>
 		<where>
-			del_flag = 0
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>
+			<if test="searchParams.status != null">
+				and status_ = #{searchParams.status}
+			</if>
+			<if test="searchParams.approveStatus != null">
+				and approve_status = #{searchParams.approveStatus}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}
@@ -231,6 +242,12 @@
 			<if test="searchParams.notrelevantId != null">
 				and jr.id_ != #{searchParams.notrelevantId}
 			</if>
+			<if test="searchParams.status != null">
+				and jr.status_ = #{searchParams.status}
+			</if>
+			<if test="searchParams.approveStatus != null">
+				and jr.approve_status = #{searchParams.approveStatus}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			${sort.name} ${sort.order}

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

@@ -92,7 +92,7 @@
 		select count(*) from job_work_category where id_=#{0}
 	</select>
 	<select id="list" resultMap="WorkCategoryMap">
-		select * from job_work_category
+		select * from job_work_category where del_flag=0
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="WorkCategoryMap">
 		<![CDATA[

web/src/main/java/com/jpsoft/employment/modules/base/controller/CityController.java

@@ -6,6 +6,7 @@ import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.base.entity.City;
 import com.jpsoft.employment.modules.base.service.CityService;
+import com.jpsoft.employment.modules.sys.entity.Menu;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -19,7 +20,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/city")
+@RequestMapping("/base/city")
 @Api(description = "city")
 public class CityController {
     private Logger logger = LoggerFactory.getLogger(getClass());
@@ -82,4 +83,45 @@ public class CityController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="区域列表")
+    @RequestMapping(value = "findListByParams",method = RequestMethod.POST)
+    public MessageResult<List> findListByParams(String type, String pid){
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+        if (StringUtils.isNotEmpty(type)) {
+            searchParams.put("type",type);
+        }
+        if (StringUtils.isNotEmpty(pid)) {
+            searchParams.put("pid",pid);
+        }
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        Page<City> page = cityService.pageSearch(searchParams,1,10000,false,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(page.getResult());
+
+        return msgResult;
+    }
+
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "list", method = RequestMethod.POST)
+    public MessageResult<List> list() {
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        List<City> cityList = cityService.list();
+        for(City city : cityList){
+            if(city.getPid() != null)
+                city.setParentId(city.getPid().toString());
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(cityList);
+
+        return msgResult;
+    }
 }

web/src/main/java/com/jpsoft/employment/modules/base/controller/CompanyController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.employment.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.City;
 import com.jpsoft.employment.modules.base.entity.Company;
 import com.jpsoft.employment.modules.base.service.CompanyService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
@@ -247,4 +248,23 @@ public class CompanyController {
 
         return msgResult;
     }
+
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "list", method = RequestMethod.POST)
+    public MessageResult<List> list() {
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("sort_no","asc"));
+        sortList.add(new Sort("create_time","asc"));
+
+        Page<Company> companyPage = companyService.pageSearch(searchParams,1,1000,false, sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(companyPage.getResult());
+
+        return msgResult;
+    }
 }

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

@@ -1,11 +1,16 @@
 package com.jpsoft.employment.modules.job.controller;
 
 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.base.entity.Company;
+import com.jpsoft.employment.modules.base.service.CompanyService;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.job.entity.Recruitment;
 import com.jpsoft.employment.modules.job.service.RecruitmentService;
+import com.jpsoft.employment.modules.sys.entity.DataDictionary;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -19,20 +24,41 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/job/recruitment")
+@Api(description = "recruitment")
 public class RecruitmentController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
     private RecruitmentService recruitmentService;
+    @Autowired
+    private CompanyService companyService;
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<Recruitment> create(){
+        MessageResult<Recruitment> msgResult = new MessageResult<>();
+
+        Recruitment recruitment = new Recruitment();
+
+        msgResult.setData(recruitment);
+        msgResult.setResult(true);
 
+        return msgResult;
+    }
+    
     @ApiOperation(value="添加信息")
     @PostMapping("add")
-    public MessageResult<Recruitment> add(@ModelAttribute Recruitment recruitment){
+    public MessageResult<Recruitment> add(@RequestBody Recruitment recruitment,@RequestAttribute String subject){
         MessageResult<Recruitment> msgResult = new MessageResult<>();
 
         try {
             recruitment.setId(UUID.randomUUID().toString());
-
+            recruitment.setDelFlag(false);
+            recruitment.setCreateBy(subject);
+            recruitment.setCreateTime(new Date());
+            
             int affectCount = recruitmentService.insert(recruitment);
 
             if (affectCount > 0) {
@@ -54,8 +80,8 @@ public class RecruitmentController {
     }
 
     @ApiOperation(value="获取信息")
-    @GetMapping("detail/{id}")
-    public MessageResult<Recruitment> detail(@PathVariable("id") String id){
+    @GetMapping("edit/{id}")
+    public MessageResult<Recruitment> edit(@PathVariable("id") String id){
         MessageResult<Recruitment> msgResult = new MessageResult<>();
 
         try {
@@ -81,10 +107,13 @@ public class RecruitmentController {
 
     @ApiOperation(value="更新用户")
     @PostMapping("update")
-    public MessageResult<Recruitment> update(@ModelAttribute Recruitment recruitment){
+    public MessageResult<Recruitment> update(@RequestBody Recruitment recruitment,@RequestAttribute String subject){
         MessageResult<Recruitment> msgResult = new MessageResult<>();
 
         try {
+            recruitment.setUpdateBy(subject);
+            recruitment.setUpdateTime(new Date());
+            
             int affectCount = recruitmentService.update(recruitment);
 
             if (affectCount > 0) {
@@ -105,19 +134,25 @@ public class RecruitmentController {
         return msgResult;
     }
 
-    @ApiOperation(value="删除用户")
+	@ApiOperation(value="删除")
     @PostMapping("delete/{id}")
-    public MessageResult<Recruitment> delete(@PathVariable("id") String id){
-        MessageResult<Recruitment> msgResult = new MessageResult<>();
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
-            int affectCount = recruitmentService.delete(id);
+            Recruitment recruitment = recruitmentService.get(id);
+            recruitment.setDelFlag(true);
+            recruitment.setUpdateBy(subject);
+            recruitment.setUpdateTime(new Date());
+
+            int affectCount = recruitmentService.update(recruitment);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
+                msgResult.setData(affectCount);
             } else {
                 msgResult.setResult(false);
-                msgResult.setMessage("数据库删除失败");
+                msgResult.setMessage("删除失败");
             }
         }
         catch(Exception ex){
@@ -132,24 +167,47 @@ public class RecruitmentController {
 
 
     @ApiOperation(value="批量删除")
-    @PostMapping("batchDelete/{id}")
-    public MessageResult<Recruitment> batchDelete(@PathVariable("id") String id){
-        MessageResult<Recruitment> msgResult = new MessageResult<>();
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
 
-        msgResult.setResult(false);
-        msgResult.setMessage("未实现");
+            for (String id : idList) {
+                Recruitment recruitment = recruitmentService.get(id);
+                recruitment.setDelFlag(true);
+                recruitment.setUpdateBy(subject);
+                recruitment.setUpdateTime(new Date());
+
+                affectCount += recruitmentService.update(recruitment);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
 
         return msgResult;
     }
 
     @ApiOperation(value="列表")
-    @RequestMapping(value = "list",method = RequestMethod.POST)
-    public MessageResult<Map> list(
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
             String id,
             @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);
@@ -165,9 +223,24 @@ public class RecruitmentController {
             searchParams.put("id","%" + id + "%");
         }
 
-
         Page<Recruitment> page = recruitmentService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-
+        for(Recruitment recruitment : page.getResult()){
+            Company company = companyService.get(recruitment.getCompanyId());
+            recruitment.setCompanyName(company.getName());
+
+            DataDictionary dataDictionary = new DataDictionary();
+            dataDictionary = dataDictionaryService.get(recruitment.getWorkYear());
+            recruitment.setWorkYearName(dataDictionary.getName());
+            dataDictionary = dataDictionaryService.get(recruitment.getEducation());
+            recruitment.setEducationName(dataDictionary.getName());
+            if(recruitment.getIsDiscussPersonally()){
+                recruitment.setWageTypeName("面议");
+            }
+            else{
+                dataDictionary = dataDictionaryService.get(recruitment.getWageType());
+                recruitment.setWageTypeName(dataDictionary.getName());
+            }
+        }
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));

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

@@ -223,4 +223,17 @@ public class WorkCategoryController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "listSelectTree",method = RequestMethod.POST)
+    public MessageResult<List> listSelectTree(@RequestAttribute String subject){
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        List<WorkCategory> list = workCategoryService.list();
+
+        msgResult.setResult(true);
+        msgResult.setData(list);
+
+        return msgResult;
+    }
 }

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

@@ -0,0 +1,130 @@
+package com.jpsoft.employment.modules.mobile.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.LabourServices;
+import com.jpsoft.employment.modules.base.service.LabourServicesService;
+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.sys.entity.User;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
+import com.jpsoft.employment.modules.sys.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/mobile/labourApi")
+@Api(description = "移动端劳务对接接口")
+public class LabourApiController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private LabourServicesService labourServicesService;
+
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @Autowired
+    private UserService userService;
+
+    @PostMapping("getLabourList")
+    @ApiOperation(value = "劳务对接列表")
+    public MessageResult<Map> getLabourList(
+            String approvalStatus,String approveTimeRange,String token,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject) {
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        if (StringUtils.isNotEmpty(approvalStatus)) {
+            searchParams.put("approvalStatus",approvalStatus);
+        }
+
+        if (StringUtils.isNotEmpty(approveTimeRange)) {
+            String[] timeRangeArray = approveTimeRange.split(",");
+            String beginTime = "";
+            String endTime = "";
+            beginTime+=" 00:00:00";
+            if (timeRangeArray.length == 1) {
+                beginTime = timeRangeArray[0];
+            } else if (timeRangeArray.length == 2) {
+                beginTime = timeRangeArray[0];
+                endTime = timeRangeArray[1];
+                beginTime+=" 00:00:00";
+                endTime+=" 23:59:59";
+            }
+
+            searchParams.put("beginTime", beginTime);
+            searchParams.put("endTime", endTime);
+        }
+
+        Page<LabourServices> page = labourServicesService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        for (LabourServices labourServices:page) {
+
+            String typeN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接类型",labourServices.getType());
+
+            labourServices.setTypeN(typeN);
+
+            String approvalStatusN = dataDictionaryService.findNameByCatalogNameAndValue("劳务对接审批状态",labourServices.getApprovalStatus());
+
+            labourServices.setApprovalStatusN(approvalStatusN);
+
+            User user = userService.get(labourServices.getApprovePersonId());
+
+            if(user!=null) {
+                labourServices.setApprovePersonName(user.getRealName());
+            }
+
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+    @PostMapping("getLabourDetails/{id}")
+    @ApiOperation(value = "劳务对接详情")
+    public MessageResult<LabourServices> getLabourDetails(
+            @PathVariable("id") String id,
+            String token) {
+        MessageResult<LabourServices> msgResult = new MessageResult<>();
+
+        try {
+            LabourServices labourServices = labourServicesService.get(id);
+
+            if (labourServices != null) {
+                msgResult.setResult(true);
+                msgResult.setData(labourServices);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+}

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

@@ -96,6 +96,9 @@ public class RecruitmentApiController {
             searchParams.put("recruitmentPosition", recruitmentPosition+"%");
         }
 
+        searchParams.put("status", 3);
+        searchParams.put("approveStatus", "open");
+
         Page<Map> page = recruitmentService.foundPageList(searchParams,pageIndex,pageSize,true,sortList);
 
         msgResult.setResult(true);
@@ -159,7 +162,7 @@ public class RecruitmentApiController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", required = true, paramType = "form")
     })
-    public MessageResult<Map> getRecruitmentList(
+    public MessageResult<Map> getRelevantList(
             String id,
             String token){
 
@@ -177,6 +180,9 @@ public class RecruitmentApiController {
         searchParams.put("relevantTitle", "%"+relevantTitle+"%");
         searchParams.put("notrelevantId", id);
 
+        searchParams.put("status", 3);
+        searchParams.put("approveStatus", "open");
+
         Page<Map> page = recruitmentService.foundPageList(searchParams,1,5,true,sortList);
 
         msgResult.setResult(true);
@@ -203,6 +209,9 @@ public class RecruitmentApiController {
             searchParams.put("id", "%"+id+"%");
         }
 
+        searchParams.put("status", 3);
+        searchParams.put("approveStatus", "open");
+
         Page<Map> page = recruitmentService.foundPageList(searchParams,1,20,true,sortList);
 
         msgResult.setResult(true);