1、招工列表调整

2、简历列表添加用户信息
3、工作查询添加地域条件
4、个人信息查询补充企业/个人实名信息

admin-hanhai-vue/.env.development

@@ -1,4 +1,5 @@
 NODE_ENV=development
+//VUE_APP_API_BASE_URL=https://admin.teyizhao.com/employ-api/
 VUE_APP_API_BASE_URL=http://localhost:8000/employ-api/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

admin-hanhai-vue/.env.production

@@ -1,4 +1,5 @@
 NODE_ENV=production
+//VUE_APP_API_BASE_URL=https://admin.teyizhao.com/employ-api/
 VUE_APP_API_BASE_URL=http://localhost:8000/employ-api/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -208,5 +208,5 @@ public class HanHaiMember implements Serializable {
 
     //简历信息
     @TableField(exist = false)
-    List<EmployResume> employResumeList;
+    EmployResume employResume;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java

@@ -311,7 +311,9 @@ public class BossApiServiceImpl implements BossApiService {
                         .eq(EmployResume::getUserId, record.getId())
                         .list();
 
-                record.setEmployResumeList(employResumeList);
+                EmployResume resume = employResumeService.getById(record.getId());
+
+                record.setEmployResume(resume);
             }
 
             return Result.OK("谁看过我(谁看过我的招工)列表", hanHaiMemberList);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java

@@ -133,12 +133,11 @@ public class CheckServiceImpl implements CheckService {
 
             //根据求职者id查询求职者简历
             for (HanHaiMember record : hanHaiMemberList.getRecords()) {
-                List<EmployResume> employResumeList = employResumeService
+                EmployResume resume = employResumeService
                         .lambdaQuery()
                         .eq(EmployResume::getUserId, record.getId())
-                        .list();
-
-                record.setEmployResumeList(employResumeList);
+                        .one();
+                record.setEmployResume(resume);
             }
 
             return Result.OK("谁看过我(谁看过我的招工)列表", hanHaiMemberList);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java

@@ -14,9 +14,12 @@ import org.jeecg.modules.employJob.service.IEmployJobService;
 import org.jeecg.modules.employResume.entity.EmployResume;
 import org.jeecg.modules.employResume.service.IEmployResumeService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 public class CollectionServiceImpl implements CollectionService {
@@ -26,6 +29,10 @@ public class CollectionServiceImpl implements CollectionService {
     @Resource
     private ShiroRealm shiroRealm;
 
+    //用户信息表
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+
     //工作信息表
     @Resource
     private IEmployJobService employJobService;
@@ -124,16 +131,19 @@ public class CollectionServiceImpl implements CollectionService {
             HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
             Page<EmployCollectionResume> page = new Page<EmployCollectionResume>(pageBean.getPageNo(), pageBean.getPageSize());
-            //获取收藏列表
+            //1、获取收藏列表
             Page<EmployCollectionResume> pageList = employCollectionResumeService
                     .lambdaQuery()
                     .eq(EmployCollectionResume::getUserId, hanHaiMember.getId())
                     .page(page);
 
-            //根据收藏列表关联简历id获取简历信息
+            //2、获取收藏简历
             for (EmployCollectionResume record : pageList.getRecords()) {
                 //获取简历信息
                 EmployResume resume = employResumeService.getById(record.getResumeId());
+                //获取用户信息
+                HanHaiMember member = hanHaiMemberService.getById(resume.getUserId());
+                resume.setHanHaiMember(member);
                 //将简历信息添加到我的收藏中
                 record.setEmployResume(resume);
             }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java

@@ -82,6 +82,10 @@ public class JobServiceImpl implements JobService {
             LambdaQueryChainWrapper<EmployJob> query = employJobService.lambdaQuery();
 
             //组装查询条件
+            if(null != employJob.getAreaId()){
+                //工作地域
+                query.eq(EmployJob::getAreaId, employJob.getAreaId());
+            }
             if(null != employJob.getTypeId()){
                 //工作类型
                 query.eq(EmployJob::getTypeId, employJob.getTypeId());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiService.UserInfoService;
+import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
+import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService;
 import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
 import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService;
 import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord;
@@ -38,6 +40,9 @@ public class UserInfoServiceImpl implements UserInfoService {
     @Resource
     private IEmployAuthenticationPersonService employAuthenticationPersonService;
 
+    //企业实名信息
+    @Resource
+    private IEmployAhthenticationCompanyService employAhthenticationCompanyService;
 
     @Resource
     private IEmployScoreRecordService employScoreRecordService;
@@ -113,6 +118,12 @@ public class UserInfoServiceImpl implements UserInfoService {
                     .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId())
                     .one();
 
+            //获取企业实名信息
+            EmployAhthenticationCompany company = employAhthenticationCompanyService
+                    .lambdaQuery()
+                    .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId())
+                    .one();
+
             //获取是否签到
             boolean signFlag = scoreService.judgeSign(token);
 
@@ -123,13 +134,18 @@ public class UserInfoServiceImpl implements UserInfoService {
             map.put("integerNum",hanHaiMember.getIntegerPrice());
             map.put("scNum",0);
             map.put("lxNum",0);
+            map.put("signFlag",signFlag);
+            map.put("vipType", vipType);//VIP类型
             if(null != person){
-                map.put("status",person.getStatus());//实名状态
+                map.put("personAuthenticationStatus",person.getStatus());//个人实名状态
             }else {
-                map.put("status","0");//实名状态
+                map.put("status","0");//个人实名状态
+            }
+            if(null != company){
+                map.put("companyAuthenticationStatus",company.getStatus());//企业实名状态
+            }else {
+                map.put("status","0");//个人实名状态
             }
-            map.put("signFlag",signFlag);
-            map.put("vipType", vipType);//VIP类型
             return Result.OK("获取个人中心基础数据信息",map);
         }catch (Exception e){
             e.printStackTrace();