Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/job/dao/UserBrowseDAO.java

@@ -23,4 +23,6 @@ public interface UserBrowseDAO {
 	int findNumberByRId(String recruitmentId);
 
 	int countByCompanyId(String companyId);
+
+	Integer rptUserBrowseCount(String hrId);
 }

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

@@ -82,4 +82,7 @@ public class ResumeDeliverRecord {
 	private String realName;
 	@ApiModelProperty(value = "联系方式")
 	private String companyPhone;
+
+	@ApiModelProperty(value = "备注面试时间")
+	private String remarkN;
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/UserBrowseService.java

@@ -20,4 +20,6 @@ public interface UserBrowseService {
 	Page<UserBrowse> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	Page<UserBrowse> pageSearchHR(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	Page<Recruitment> loadUserBrowses(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+
+	Integer rptUserBrowseCount(String hrId);
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/ResumeDeliverRecordServiceImpl.java

@@ -167,7 +167,7 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 
 				userName = model.getRealName();
 				tel = model.getCompanyPhone();
-
+				dateTime = model.getRemarkN();
 
 				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);
@@ -179,12 +179,18 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 				resumeDeliverContent.setEntryPost(position);
 				resumeDeliverContent.setEntryDepartment(positionDep);
 				tel = model.getCompanyPhone();
+				userName = model.getRealName();
+
 
 				sendMessage(model,chatType,jobUserName,companyName,userName,dateTime,tel,recruitment.getAddress(),sendDate,department,
 						idCard,position,positionDep,workAddress);
 			}
 			else if(chatType.equals("6")){
 				resumeDeliverContent.setRemark(model.getRemark());
+				resumeDeliver.setChatStatus("6");
+				resumeDeliver.setUpdateTime(model.getUpdateTime());
+				resumeDeliver.setUpdateBy(model.getUpdateBy());
+				int countUpdate = resumeDeliverDAO.update(resumeDeliver);
 			}
 
             affectCount = resumeDeliverContentDAO.insert(resumeDeliverContent);
@@ -268,6 +274,7 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 
 			templateContent = templateContent.replace("{jobUserName}",jobUserName);
 			templateContent = templateContent.replace("{companyName}",companyName);
+			templateContent = templateContent.replace("{userName}",userName);
 			templateContent = templateContent.replace("{idCard}",idCard);
 			templateContent = templateContent.replace("{position}",position);
 			templateContent = templateContent.replace("{positionDep}",positionDep);

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/UserBrowseServiceImpl.java

@@ -99,4 +99,8 @@ public class UserBrowseServiceImpl implements UserBrowseService {
 		return userBrowseDAO.countByCompanyId(companyId);
 	}
 
+	@Override
+	public Integer rptUserBrowseCount(String hrId) {
+		return userBrowseDAO.rptUserBrowseCount(hrId);
+	}
 }

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/base/LabourServices.xml

@@ -123,7 +123,7 @@
 			</if>
 			<if test="searchParams.typeB != null">
 				<![CDATA[
-                  and type_ = #{searchParams.typeB}
+                  and type_ = #{searchParams.typeB} and approval_status = '2'
                 ]]>
 			</if>
 		</where>

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

@@ -191,18 +191,19 @@
 			  jj.real_name name,
 			  jj.head_image_url headImage,
 			  jre.id_ id,
-			  su.id_ sysUseId,
-			  jub.create_time as create_time
+			  su.id_ sysUseId
 			FROM
 			  job_user_browse jub
 			INNER JOIN job_recruitment jr ON jub.job_recruitment_id = jr.id_
 			INNER JOIN sys_user su ON jr.company_id = su.company_id
 			INNER JOIN job_jobuser jj ON jub.job_user_id = jj.id_
-			LEFT JOIN job_resume jre ON jj.id_ = jre.job_user_id on jre.approve_status=2
+			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,14 @@
 
 	<!--招聘方个人中心主页：统计已发布的招聘,被浏览量(不包含已撤销的(已关闭的))-->
 	<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 approve_status != '4'
+		and del_flag = 0
 	</select>
 
 	<!--招聘方职位管理 上下架管理-->

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

@@ -198,12 +198,12 @@
 			  year(now())-year(jre.birthday_)  age,
 			  sddd.name_ workExp,
 			  sdde.name_ education,
+			  sddf.name_ dreamAdd,
 			  jj.head_image_url headImage,
 			  jj.real_name name,
 			  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
@@ -212,17 +212,19 @@
 			LEFT JOIN sys_data_dictionary sddb ON jre.job_status = sddb.id_
 			LEFT JOIN sys_data_dictionary sddd ON jre.work_exp = sddd.id_
 			LEFT JOIN sys_data_dictionary sdde ON jre.education_ = sdde.id_
+			LEFT JOIN sys_data_dictionary sddf ON jre.dream_add = sddf.id_
 			LEFT JOIN job_jobuser jj ON jre.job_user_id = jj.id_
 			LEFT JOIN job_resume_deliver jrd ON jre.id_ = jrd.job_resume_id
 			LEFT JOIN job_recruitment jr ON jrd.job_recruitment_id = jr.id_
 			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}
+				and jrd.chat_status = #{searchParams.type}
 			</if>
 			<if test="searchParams.sex != null">
 				and jre.sex_ = #{searchParams.sex}

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

@@ -232,4 +232,29 @@
 		inner join job_recruitment b on a.job_recruitment_id=b.id_
 		where a.del_flag = false and b.del_flag = false and b.company_id = #{0}
 	</select>
+
+	<select id="rptUserBrowseCount" parameterType="String" resultType="Integer">
+		SELECT
+			count(1) interestTimes
+		FROM
+			(
+				SELECT DISTINCT
+					jj.id_ jobUserId,
+					jj.real_name NAME,
+					jj.head_image_url headImage,
+					jre.id_ id,
+					su.id_ sysUseId
+				FROM
+					job_user_browse jub
+				INNER JOIN job_recruitment jr ON jub.job_recruitment_id = jr.id_
+				INNER JOIN sys_user su ON jr.company_id = su.company_id
+				INNER JOIN job_jobuser jj ON jub.job_user_id = jj.id_
+				LEFT JOIN job_resume jre ON jj.id_ = jre.job_user_id
+				<where>
+					jre.del_flag = 0
+				AND jr.status_ = '1'
+				AND su.id_ = #{hrId}
+				</where>
+			) interest
+	</select>
 </mapper>

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

@@ -129,7 +129,21 @@
 	</select>
 
 	<select id="rptHrBrowseCount" parameterType="String" resultType="Integer">
-		select count(1) from job_user_browse_hr   where  sys_user_id=#{0} and del_flag=0
+		SELECT
+			COUNT(DISTINCT job_resume_id) hrBrowseResumeCount
+		FROM
+			(
+				SELECT
+					jubh.job_resume_id
+				FROM
+					job_user_browse_hr jubh
+				LEFT JOIN job_resume jr ON jubh.job_resume_id = jr.id_
+				<where>
+					jubh.sys_user_id = #{hrId}
+				AND jubh.del_flag = 0
+				AND jr.del_flag = 0
+				</where>
+			) list
 	</select>
 	<select id="countBySysUserId"  resultType="int">
 		<![CDATA[

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

@@ -368,6 +368,8 @@ public class LabourServicesController {
             if (affectCount > 0) {
                 LabourServices labourServices = labourServicesService.get(cid);
                 labourServices.setApprovalStatus(approveStatus);
+                labourServices.setApprovePersonId(subject);
+                labourServices.setApproveTime(new Date());
                 labourServices.setUpdateBy(subject);
                 labourServices.setUpdateTime(new Date());
                 labourServicesService.update(labourServices);

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

@@ -151,6 +151,7 @@ public class ResumeDeliverController {
                 }
                 resumeDeliverRecord.setRemark("面试时间：" + ChatDateStr + " " + resumeDeliverRecordDTO.getChatTime());
 
+                resumeDeliverRecord.setRemarkN(ChatDateStr + " " + resumeDeliverRecordDTO.getChatTime());
                 resumeDeliverRecord.setRealName(resumeDeliverRecordDTO.getRealName());
                 resumeDeliverRecord.setCompanyPhone(resumeDeliverRecordDTO.getCompanyPhone());
             }
@@ -572,11 +573,13 @@ public class ResumeDeliverController {
 
                     dto.setPositionNumber(recruitment.getPositionNumber());
 
-                    WorkCategory workCategory = workCategoryService.get(recruitment.getPosition());
+//                    WorkCategory workCategory = workCategoryService.get(recruitment.getPosition());
+//
+//                    if (workCategory != null) {
+//                        dto.setPosition(workCategory.getName());
+//                    }
 
-                    if (workCategory != null) {
-                        dto.setPosition(workCategory.getName());
-                    }
+                    dto.setPosition(recruitment.getTitle());
 
                 }
 

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

@@ -49,7 +49,7 @@ public class LabourApiController {
             @ApiImplicitParam(name = "typeB", value = "类型(1：我要用工,2：我有工人)", required = false, paramType = "query"),
     })
     public MessageResult<Map> getLabourList(
-            String approvalStatus,String approveTimeRange,String token,String typeB,
+            String approveTimeRange,String token,String typeB,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject) {
@@ -70,14 +70,6 @@ public class LabourApiController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("create_time","desc"));
 
-            if(!userService.hasRole(user.getId(),"SYSADMIN")&&!userService.hasRole(user.getId(),"ADMIN")){
-                searchParams.put("userId", user.getId());
-            }
-
-            if (StringUtils.isNotEmpty(approvalStatus)) {
-                searchParams.put("approvalStatus",approvalStatus);
-            }
-
             if (StringUtils.isNotEmpty(approveTimeRange)) {
                 String[] timeRangeArray = approveTimeRange.split(",");
                 String beginTime = "";

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

@@ -70,6 +70,9 @@ public class RecruiterApiController {
     @Autowired
     private ResumeDeliverService resumeDeliverService;
 
+    @Autowired
+    private UserBrowseService  userBrowseService;
+
     @PostMapping("getAboutMe")
     @ApiOperation(value = "招聘方['我的'主页]")
     public MessageResult<Map<String,Object>>  getAboutMe(
@@ -82,11 +85,13 @@ public class RecruiterApiController {
             UserVO  uv=userService.getUser(subject);
             Map<String,Object> recRptMap=recruitmentService.rptMyRecruitmentCount(subject);  //发布的招聘个数（不含已撤销的）（我的职位）;被求职者浏览人数（对您感兴趣）
             Integer hrBrowseResumeCount=userBrowseHrService.rptHrBrowseCount(subject); //统计hr浏览的简历数量（看过的人才）
+            Integer userBrowseResumeCount=userBrowseService.rptUserBrowseCount(subject);
             if(recRptMap==null){
                 recRptMap=new HashMap<String,Object>(2);
             }
             recRptMap.put("hr",uv);
             recRptMap.put("browseResumeCount",hrBrowseResumeCount);
+            recRptMap.put("interestTimes",userBrowseResumeCount);
             //recCount：职位个数；readTimes：职位被浏览量；browseResumeCount：hr浏览简历数量；hr:hr个人信息
             return MessageResultBuilder.ok(recRptMap);
         }
@@ -255,24 +260,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,26 +284,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 + "%");
-        }
-
-        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

@@ -165,7 +165,6 @@ public class RecruitmentApiController {
             } else {
                 map.put("tagList","");
             }
-
         }
 
         msgResult.setResult(true);
@@ -387,9 +386,44 @@ public class RecruitmentApiController {
         searchParams.put("status", 1);
         searchParams.put("approveStatus", 3);
 
+        Page<Map> page = recruitmentService.foundPageList(searchParams,1,5,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","");
+            }
 
-        Page<Map> page = recruitmentService.foundPageList(searchParams,1,5,true,sortList);
+        }
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
@@ -424,6 +458,42 @@ 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));
 
@@ -647,4 +717,61 @@ 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;
+    }
+    @PostMapping("getCompany")
+    @ApiOperation(value = "企业详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId", value = "公司id", required = false, paramType = "query"),
+    })
+    public MessageResult<Company> getCompany(
+            String token,String companyId,    @RequestAttribute  String subject) {
+        System.out.println(subject);
+
+        MessageResult<Company> msgResult = new MessageResult<>();
+
+        Company company = companyService.get(companyId);
+        company.setScaleName(dataDictionaryService.getName(company.getScale()));
+        company.setIndustry(dataDictionaryService.getName(company.getIndustry()));
+
+
+        msgResult.setResult(true);
+        msgResult.setData(company);
+
+        return msgResult;
+    }
 }