Merge remote-tracking branch 'origin/master'

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

@@ -176,6 +176,12 @@
 			<if test="searchParams.workArea != null">
 				and a.work_area like #{searchParams.workArea}
 			</if>
+			<if test="searchParams.isOnline != null">
+				and a.is_online = #{searchParams.isOnline}
+			</if>
+			<if test="searchParams.isTopping != null">
+				and a.is_topping = #{searchParams.isTopping}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

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

@@ -230,7 +230,7 @@ public class RecruitInformationInfoController {
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Object> pageList(
             String name,String positionName,String intendedIndustries,String method,
-            String status,String workArea,
+            String status,String workArea,String isOnline,String isTopping,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestParam(value = "exportFlag", defaultValue = "false") Boolean exportFlag,
@@ -273,6 +273,25 @@ public class RecruitInformationInfoController {
                 searchParams.put("status", status);
             }
 
+            if (StringUtils.isNotEmpty(isOnline)) {
+                if("0".equals(isOnline)){
+                    searchParams.put("isOnline", false);
+                }
+                else{
+                    searchParams.put("isOnline", true);
+                }
+
+            }
+
+            if (StringUtils.isNotEmpty(isTopping)) {
+                if("0".equals(isTopping)){
+                    searchParams.put("isTopping", false);
+                }
+                else{
+                    searchParams.put("isTopping", true);
+                }
+            }
+
 
             Page<RecruitInformationInfo> page = recruitInformationInfoService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
 

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

@@ -89,19 +89,19 @@ public class ReportController {
         //认证企业数，累计数
         Integer totalEnterpriseNum = enterpriseInfoService.dailyReportList(searchParams1);
 
-        //时实岗位数量
+        //累计岗位数量
         Integer totalRecruitStatusNum = recruitInformationInfoService.dailyReportList(searchParams1);
 
         //新增岗位数量
         searchParams.put("status","1");
-        searchParams.put("is_online",true);
-        searchParams.put("delFlag",true);
+        searchParams.put("isOnline",true);
+        searchParams.put("delFlag",false);
         Integer recruitNum = recruitInformationInfoService.dailyReportList(searchParams);
 
-        //时实岗位数量
+        //实时岗位数量
         searchParams1.put("status","1");
-        searchParams1.put("is_online",true);
-        searchParams1.put("delFlag",true);
+        searchParams1.put("isOnline",true);
+        searchParams1.put("delFlag",false);
         Integer totalRecruitNum = recruitInformationInfoService.dailyReportList(searchParams1);
 
         //今日报名人数