Merge remote-tracking branch 'origin/master'

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

@@ -180,6 +180,9 @@
 			<if test="searchParams.isCertification != null">
 				and is_certification = #{searchParams.isCertification}
 			</if>
+			<if test="searchParams.companyName != null">
+				and name_ like #{searchParams.companyName}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

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

@@ -200,8 +200,10 @@
 			LEFT JOIN job_resume jre ON jj.id_ = jre.job_user_id
 		]]>
 		<where>
+			jre.del_flag = 0
+			and jr.status_ = '1'
 			<if test="searchParams.id != null">
-				and su.id = #{searchParams.id}
+				and su.id_ like #{searchParams.id}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -334,7 +334,7 @@
 
 	<!--招聘方个人中心主页：统计已发布的招聘,被浏览量(不包含已撤销的(已关闭的))-->
 	<select id="rptMyRecruitmentCount" parameterType="String" resultType="Map">
-		select count(1) jobCount,sum(reading_times) readTimes from job_recruitment where create_by=#{0} and status_='1'
+		select count(1) jobCount,sum(reading_times) readTimes from job_recruitment where create_by=#{hrId} and status_='1'
 	</select>
 
 	<!--招聘方职位管理 上下架管理-->

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

@@ -204,7 +204,7 @@
 			  jre.id_ resumeId,
 			  jre.sex_ sex,
 			  jre.dream_add dreamAdd,
-			  jre.approve_status approveStatus,
+			  jrd.chat_status approveStatus,
               su.id_ sysUserId
 			FROM
 			  job_resume jre
@@ -220,14 +220,12 @@
 			INNER JOIN sys_user su ON jr.company_id = su.company_id
 		]]>
 		<where>
+			jrd.del_flag = 0
 			<if test="searchParams.id != null">
-				and su.id_ = #{searchParams.id}
+				and su.id_ like #{searchParams.id}
 			</if>
 			<if test="searchParams.type != null">
-				and jre.approve_status = #{searchParams.type}
-			</if>
-			<if test="searchParams.type = null">
-				and jre.approve_status > 0
+				and jrd.chat_status = #{searchParams.type}
 			</if>
 			<if test="searchParams.sex != null">
 				and jre.sex_ = #{searchParams.sex}

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

@@ -255,24 +255,17 @@ public class RecruiterApiController {
     @PostMapping("loadInterestList")
     @ApiOperation(value = "招聘方[对您感兴趣]")
     public MessageResult<Map> loadInterestList(
-            String id,String token,
+            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("jub.create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
-        }
-
-        Page<Map> page = jobUserService.foundInterestList(searchParams,pageIndex,pageSize,true,sortList);
+        Map<String,Object> args=MapUtils.builder("id",subject);
+        Page<Map> page = jobUserService.foundInterestList(args,pageIndex,pageSize,true,sortList);
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
@@ -286,28 +279,18 @@ public class RecruiterApiController {
             @ApiImplicitParam(name = "type", value = "类型(1:已投递,2:邀沟通,3:邀面试,4:邀入职,5:已入职,6:不合适)", required = false, paramType = "query")
     })
     public MessageResult<Map> loadJobManagement(
-            String id,String token,String type,
+            String token,String type,
             @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("jrd.create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
-        }
-
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("type",type);
-        }
-
-        Page<Map> page = resumeService.foundJobManagement(searchParams,pageIndex,pageSize,true,sortList);
+        Map<String,Object> args=MapUtils.builder("id",subject,"type",type);
+        Page<Map> page = resumeService.foundJobManagement(args,pageIndex,pageSize,true,sortList);
 
         for (Map map:page) {
             String sexName = dataDictionaryService.findNameByCatalogNameAndValue("性别",map.get("sex").toString());

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

@@ -682,4 +682,40 @@ public class RecruitmentApiController {
 
         return msgResult;
     }
+
+    @PostMapping("getCompanyList")
+    @ApiOperation(value = "企业名录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyName", value = "公司名", required = false, paramType = "query"),
+    })
+    public MessageResult<Map> getCompanyList(
+            String token,String companyName,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="10") 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(companyName)) {
+            searchParams.put("companyName",companyName+"%");
+        }
+
+        Page<Company> page = companyService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        for (Company company:page) {
+           company.setScaleName(dataDictionaryService.getName(company.getScale()));
+           company.setIndustry(dataDictionaryService.getName(company.getIndustry()));
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
 }