1、工作/简历倒序排列

2、添加记工信息查询接口
3、个人信息补充收藏/联系数量

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/AuthenticationController.java

@@ -79,7 +79,7 @@ public class AuthenticationController {
 
     @ApiOperation(value="我的服务-查询企业实名认证信息", notes="我的服务-查询企业实名认证信息")
     @RequestMapping(value = "/getAuthenticationCompany", method = {RequestMethod.GET})
-    public Result<?> getAuthenticationCompany(String token){
+    public Result<?> getAuthenticationCompany(@RequestHeader("X-Access-Token") String token){
         //业务处理
         return authenticationService.getAuthenticationCompany(token);
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java

@@ -117,4 +117,11 @@ public class NotebookController {
         return notebookService.addWorkInfo(token, employWorkInfo);
     }
 
+    @ApiOperation(value="记工记账-查询记工记录", notes="记工记账-查询记工记录")
+    @RequestMapping(value = "/queryWork", method = {RequestMethod.GET})
+    public Result<?> queryWork(@RequestHeader("X-Access-Token")String token, EmployWorkInfo workInfo, PageBean pageBean){
+        //业务处理
+        return notebookService.queryWork(token, workInfo, pageBean);
+    }
+
 }

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

@@ -33,4 +33,7 @@ public interface NotebookService {
     //个人记工-项目记工
     public Result<?> addWorkInfo(String token, EmployWorkInfo employWorkInfo);
 
+    //记工记账-项目记工记录
+    public Result<?> queryWork(String token, EmployWorkInfo workInfo, PageBean pageBean);
+
 }

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

@@ -98,6 +98,8 @@ public class JobServiceImpl implements JobService {
                 //所属公司
                 query.eq(EmployJob::getCompany, employJob.getCompany());
             }
+            //按时间倒序
+            query.orderByDesc(EmployJob::getCreateTime);
 
 
             //获取工作信息列表

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

@@ -317,11 +317,11 @@ public class NotebookServiceImpl implements NotebookService {
     //记工记账-项目记工
     @Override
     public Result<?> addWorkInfo(String token, EmployWorkInfo employWorkInfo) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         String message = "项目记工添加失败！";
-        try{
-            //权限验证
-            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
+        try{
             boolean result = employWorkInfoService.save(employWorkInfo);
 
             if(result){
@@ -337,4 +337,38 @@ public class NotebookServiceImpl implements NotebookService {
         }
     }
 
+    //记工记账-查询记工信息
+    @Override
+    public Result<?> queryWork(String token, EmployWorkInfo workInfo, PageBean pageBean){
+
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        try{
+            //分页
+            Page<EmployWorkInfo> page = new Page<EmployWorkInfo>(pageBean.getPageNo(), pageBean.getPageSize());
+            LambdaQueryChainWrapper<EmployWorkInfo> query = employWorkInfoService
+                    .lambdaQuery();
+
+            //组装查询条件
+            if(null != workInfo.getNotebookId()){
+                //关联账本id
+                query.eq(EmployWorkInfo::getNotebookId, workInfo.getNotebookId());
+            }
+            if(null != workInfo.getType()){
+                //记账类型
+                query.eq(EmployWorkInfo::getType, workInfo.getType());
+            }
+
+            //获取记工记录信息
+            Page<EmployWorkInfo> pageList = query.page(page);
+
+            return Result.OK("记工记录", pageList);
+        }catch (Exception e){
+            return Result.error("记工记录查询失败");
+        }
+
+
+    }
+
 }

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

@@ -82,6 +82,8 @@ public class ResumeServiceImpl implements ResumeService {
                 //工作性质
                 query.eq(EmployResume::getNatureId, employResume.getNatureId());
             }
+            //按时间倒序
+            query.orderByDesc(EmployResume::getCreateTime);
 
 
             //获取简历信息列表

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

@@ -3,12 +3,27 @@ package org.jeecg.modules.apiService.impl;
 
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBoot401Exception;
 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.employCheckJob.entity.EmployCheckJob;
+import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService;
+import org.jeecg.modules.employCheckResume.entity.EmployCheckResume;
+import org.jeecg.modules.employCheckResume.service.IEmployCheckResumeService;
+import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob;
+import org.jeecg.modules.employCollectionJob.service.IEmployCollectionJobService;
+import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume;
+import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService;
+import org.jeecg.modules.employCompany.entity.EmployCompany;
+import org.jeecg.modules.employCompany.service.IEmployCompanyService;
+import org.jeecg.modules.employJob.entity.EmployJob;
+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.employScoreRecord.entity.EmployScoreRecord;
 import org.jeecg.modules.employScoreRecord.service.IEmployScoreRecordService;
 import org.jeecg.modules.employVip.entity.EmployVip;
@@ -23,6 +38,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -36,6 +52,10 @@ public class UserInfoServiceImpl implements UserInfoService {
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
 
+    //企业信息表
+    @Resource
+    private IEmployCompanyService employCompanyService;
+
     //个人实名信息
     @Resource
     private IEmployAuthenticationPersonService employAuthenticationPersonService;
@@ -44,6 +64,30 @@ public class UserInfoServiceImpl implements UserInfoService {
     @Resource
     private IEmployAhthenticationCompanyService employAhthenticationCompanyService;
 
+    //工作信息表
+    @Resource
+    private IEmployJobService employJobService;
+
+    //简历信息表
+    @Resource
+    private IEmployResumeService employResumeService;
+
+    //我收藏的工作记录表
+    @Resource
+    private IEmployCollectionJobService employCollectionJobService;
+
+    //我收藏的简历记录表
+    @Resource
+    private IEmployCollectionResumeService employCollectionResumeService;
+
+    //我查看的工作记录表
+    @Resource
+    private IEmployCheckJobService employCheckJobService;
+
+    //我查看的简历记录表
+    @Resource
+    private IEmployCheckResumeService employCheckResumeService;
+
     @Resource
     private IEmployScoreRecordService employScoreRecordService;
 
@@ -64,9 +108,10 @@ public class UserInfoServiceImpl implements UserInfoService {
 
     @Override
     public Result<?> queryUserInfo(String token){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         try{
-            //权限验证
-            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
             HanHaiMember byId = hanHaiMemberService.getById(hanHaiMember.getId());
             return Result.OK(byId);
         }catch (Exception e){
@@ -77,9 +122,10 @@ public class UserInfoServiceImpl implements UserInfoService {
 
     @Override
     public Result<?> updateUserInfo(String token,String nickName,String phone,String headImage){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         try{
-            //权限验证
-            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
             //用户昵称不能为空
             if(StringUtils.isBlank(nickName)){
                 return Result.error("用户昵称不能为空");
@@ -105,21 +151,21 @@ public class UserInfoServiceImpl implements UserInfoService {
     //lzx：获取个人中心基础数据信息
     @Override
     public Result<?> getUserCenterData(String token){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         //返回信息
         Map map = new HashMap();
 
         try{
-            //权限验证
-            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-
             //获取个人实名信息
-            EmployAuthenticationPerson person = employAuthenticationPersonService
+            EmployAuthenticationPerson ahthenticationPerson = employAuthenticationPersonService
                     .lambdaQuery()
                     .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId())
                     .one();
 
             //获取企业实名信息
-            EmployAhthenticationCompany company = employAhthenticationCompanyService
+            EmployAhthenticationCompany ahthenticationCompany = employAhthenticationCompanyService
                     .lambdaQuery()
                     .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId())
                     .one();
@@ -130,21 +176,42 @@ public class UserInfoServiceImpl implements UserInfoService {
             //获取用户vip类型
             String vipType = getVip(token);
 
+            //boss
+            //简历收藏数量
+            int resumeCollectionNum = collectionResumeNum(hanHaiMember.getId());
+            //简历查看数量(我看过谁)
+            int resumeCheckNumBoss = checkResumeNumBoss(hanHaiMember.getId());
+            //工作被查看数量(谁看过我)
+            int jobCheckNumBoss = checkResumeNumBoss(hanHaiMember.getId());
+
+            //employee
+            //工作收藏数量
+            int jobCollectionNum = collectionJobNum(hanHaiMember.getId());
+            //工作查看数量(我看过谁)
+            int jobcheckNumEmployee = checkJobNumEmployee(hanHaiMember.getId());
+            //简历被查看数量(谁看过我)
+            int resumeCheckNumEmployee = checkResumeNumEmployee(hanHaiMember.getId());
+
             //组装个人基础数据
             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("personAuthenticationStatus",person.getStatus());//个人实名状态
+            map.put("resumeCollectionNum", resumeCollectionNum);
+            map.put("resumeCheckNumBoss", resumeCheckNumBoss);
+            map.put("jobCheckNumBoss", jobCheckNumBoss);
+
+            map.put("jobCollectionNum", jobCollectionNum);
+            map.put("jobcheckNumEmployee", jobcheckNumEmployee);
+            map.put("resumeCheckNumEmployee", resumeCheckNumEmployee);
+            if(null != ahthenticationPerson){
+                map.put("personAuthenticationStatus",ahthenticationPerson.getStatus());//个人实名状态
             }else {
-                map.put("status","0");//个人实名状态
+                map.put("personAuthenticationStatus","-1");//个人实名状态
             }
-            if(null != company){
-                map.put("companyAuthenticationStatus",company.getStatus());//企业实名状态
+            if(null != ahthenticationCompany){
+                map.put("companyAuthenticationStatus",ahthenticationCompany.getStatus());//企业实名状态
             }else {
-                map.put("status","0");//个人实名状态
+                map.put("companyAuthenticationStatus","-1");//企业实名状态
             }
             return Result.OK("获取个人中心基础数据信息",map);
         }catch (Exception e){
@@ -155,10 +222,10 @@ public class UserInfoServiceImpl implements UserInfoService {
 
     //获取用户VIP信息
     public String getVip(String token){
-        try{
-            //权限验证
-            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
+        try{
             //查询用户vip关联
             EmployVipUser vu = employVipUserService
                     .lambdaQuery()
@@ -178,4 +245,94 @@ public class UserInfoServiceImpl implements UserInfoService {
             return "Vip信息查询失败";
         }
     }
+
+    //我的工作收藏数量统计
+    public int collectionJobNum(String userId){
+
+        List<EmployCollectionJob> collectionJobList = employCollectionJobService
+                .lambdaQuery()
+                .eq(EmployCollectionJob::getUserId, userId)
+                .list();
+
+        return collectionJobList.size();
+    }
+
+    //我的简历收藏数量统计
+    public int collectionResumeNum(String userId){
+
+        List<EmployCollectionResume> collectionResumeList = employCollectionResumeService
+                .lambdaQuery()
+                .eq(EmployCollectionResume::getUserId, userId)
+                .list();
+
+        return collectionResumeList.size();
+    }
+
+    //boss
+    //工作联系记录(谁看过我)
+    public int checkJobNumBoss(String userId){
+        //查看我发布的简历
+        List<EmployJob> jobList  = employJobService
+                .lambdaQuery()
+                .eq(EmployJob::getUserId, userId)
+                .list();
+
+        //获取查看我发布的工作id列表
+        int jobSize = (int)jobList.size();
+        Object[] jobIds = new Object[jobSize];
+        int jobIndex = 0;
+        for (EmployJob job : jobList) {
+            jobIds[jobIndex] = job.getId();
+            jobIndex++;
+        }
+        if(jobSize == 0){
+            return 0;
+        }
+
+        //获取工作被查询的记录
+        List<EmployCheckJob> checkJobList = employCheckJobService
+                .lambdaQuery()
+                .in(EmployCheckJob::getJobId, jobIds)
+                .list();
+
+        return checkJobList.size();
+    }
+
+    //简历联系记录(我看过谁)
+    public int checkResumeNumBoss(String userId){
+        List<EmployCheckResume> checkResumeList = employCheckResumeService
+                .lambdaQuery()
+                .eq(EmployCheckResume::getUserId, userId)
+                .list();
+        return checkResumeList.size();
+    }
+
+    //employee
+    //工作联系记录(我看过谁)
+    public int checkJobNumEmployee(String userId){
+        List<EmployCheckJob> checkJobList = employCheckJobService
+                .lambdaQuery()
+                .eq(EmployCheckJob::getUserId, userId)
+                .list();
+        return checkJobList.size();
+    }
+
+    //简历联系记录(谁看过我)
+    public int checkResumeNumEmployee(String userId){
+        //1、查看我的简历
+        EmployResume resume = employResumeService
+                .lambdaQuery()
+                .eq(EmployResume::getUserId, userId)
+                .one();
+
+        //2、根据我简历id查询简历被查看记录
+        List<EmployCheckResume> checkResumeList = employCheckResumeService
+                .lambdaQuery()
+                .eq(EmployCheckResume::getResumeId, resume.getId())
+                .list();
+        return checkResumeList.size();
+    }
+
+
+
 }

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

@@ -40,11 +40,11 @@ public class VipServiceImpl implements VipService {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         //生成订单信息
-        String payNo = IdWorker.getIdStr();//生成订单号
         EmployVipRecord vipRecord = new EmployVipRecord();
+        String payNo = IdWorker.getIdStr();//生成订单号
         vipRecord.setPayNo(payNo);//订单号
         vipRecord.setUserId(hanHaiMember.getId());//关联用户id
-        vipRecord.setVipTypeId(vipTypeId);//会员类型
+        vipRecord.setVipTypeId(vipTypeId);//会员类型id
 
         //根据会员类型查询会员名称
         EmployVipType vipType = employVipTypeService