Merge remote-tracking branch 'origin/master'

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

@@ -228,6 +228,7 @@
 				jr.address_ AS address,
 				jr.requirements_ AS requirements,
 				jr.position_number AS positionNumber,
+				jr.welfare_ AS tagList,
 				bc.logo_ AS logo,
 				bc.name_ AS name,
 			    bci.city_name AS cityName,

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

@@ -131,6 +131,43 @@ public class RecruitmentApiController {
 
         Page<Map> page = recruitmentService.foundPageList(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (Map map:page) {
+            List<String> welfareList = new ArrayList<>();
+            Object tagListN = map.get("tagList");
+            if(tagListN != null){
+                JSONObject jsonObject = JSONObject.fromObject(tagListN.toString());
+                if(jsonObject!=null&&jsonObject.size()>0) {
+                    String checkboxGroup1="";
+                    String dynamicTags="";
+                    if(jsonObject.get("checkboxGroup1")!=null){
+                        checkboxGroup1 = jsonObject.get("checkboxGroup1").toString();
+                    }
+                    if(jsonObject.get("dynamicTags")!=null){
+                        dynamicTags = jsonObject.get("dynamicTags").toString();
+                    }
+                    if(StringUtils.isNotEmpty(checkboxGroup1)){
+                        String[] checkboxGroupArray = checkboxGroup1.split(",");
+                        for (String dicId:checkboxGroupArray) {
+                            DataDictionary dataDictionary = dataDictionaryService.get(dicId);
+                            if(dataDictionary!=null){
+                                welfareList.add(dataDictionary.getName());
+                            }
+                        }
+                    }
+                    if(StringUtils.isNotEmpty(dynamicTags)){
+                        String[] dynamicTagArray = dynamicTags.split(",");
+                        for (String name:dynamicTagArray) {
+                            welfareList.add(name);
+                        }
+                    }
+                }
+                map.put("tagList",welfareList.toArray());
+            } else {
+                map.put("tagList","");
+            }
+
+        }
+
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
 
@@ -350,6 +387,8 @@ public class RecruitmentApiController {
         searchParams.put("status", 1);
         searchParams.put("approveStatus", 3);
 
+
+
         Page<Map> page = recruitmentService.foundPageList(searchParams,1,5,true,sortList);
 
         msgResult.setResult(true);
@@ -365,7 +404,9 @@ public class RecruitmentApiController {
     })
     public MessageResult<Map> getCompanyDetails(
             String id,
-            String token) {
+            String token,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize) {
         MessageResult<Map> msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();
@@ -381,7 +422,7 @@ public class RecruitmentApiController {
         searchParams.put("status", 1);
         searchParams.put("approveStatus", 3);
 
-        Page<Map> page = recruitmentService.foundPageList(searchParams,1,20,true,sortList);
+        Page<Map> page = recruitmentService.foundPageList(searchParams,pageIndex,pageSize,true,sortList);
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));