Merge remote-tracking branch 'origin/master'

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

@@ -118,8 +118,10 @@
                   and approve_time <= #{searchParams.endTime}
                 ]]>
 			</if>
-			<if test="searchParams.type != null">
-				and type_ = #{searchParams.type}
+			<if test="searchParams.typeB != null">
+				<![CDATA[
+                  and type_ = #{searchParams.typeB}
+                ]]>
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -12,6 +12,8 @@ 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.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -43,8 +45,11 @@ public class LabourApiController {
 
     @PostMapping("getLabourList")
     @ApiOperation(value = "劳务对接列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "typeB", value = "类型(1：我要用工,2：我要工人)", required = false, paramType = "query"),
+    })
     public MessageResult<Map> getLabourList(
-            String approvalStatus,String approveTimeRange,String token,
+            String approvalStatus,String approveTimeRange,String token,String typeB,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject) {
@@ -61,6 +66,8 @@ public class LabourApiController {
             searchParams.put("approvalStatus",approvalStatus);
         }
 
+        searchParams.put("typeB",typeB);
+
         if (StringUtils.isNotEmpty(approveTimeRange)) {
             String[] timeRangeArray = approveTimeRange.split(",");
             String beginTime = "";