diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java index b712fa8..6adab84 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java @@ -1,16 +1,11 @@ package com.ruoyi.cms.controller.cms; import com.alibaba.fastjson.JSON; -import com.ruoyi.cms.domain.ESJobDocument; -import com.ruoyi.cms.domain.Job; -import com.ruoyi.cms.domain.JobCollection; +import com.ruoyi.cms.domain.*; import com.ruoyi.cms.domain.query.ESJobSearch; import com.ruoyi.cms.domain.vo.CandidateVO; import com.ruoyi.cms.domain.vo.CompanyVo; -import com.ruoyi.cms.service.IAppUserService; -import com.ruoyi.cms.service.ICompanyService; -import com.ruoyi.cms.service.IJobCollectionService; -import com.ruoyi.cms.service.IJobService; +import com.ruoyi.cms.service.*; import com.ruoyi.cms.util.RoleUtils; import com.ruoyi.cms.util.StringUtil; import com.ruoyi.cms.util.sensitiveWord.SensitiveWordChecker; @@ -58,6 +53,10 @@ public class CmsJobController extends BaseController private IJobCollectionService jobCollectionService; @Autowired private IAppUserService appUserService; + @Autowired + private IJobApplyService iJobApplyService; + @Autowired + private IAppReviewJobService iAppReviewJobService; /** * 查询岗位列表 */ @@ -208,4 +207,61 @@ public class CmsJobController extends BaseController } return toAjax(jobCollectionService.pcJobCollection(jobCollection)); } + + @ApiOperation("获取用户岗位收藏列表") + @GetMapping("/getAppUserYhsc") + public AjaxResult getAppUserYhsc(JobCollection jobCollection) + { + if(!SecurityUtils.isLogin()){ + return AjaxResult.error("用户未登录!"); + } + if(jobCollection.getUserId()==null){ + String idCard=RoleUtils.getCurrentUseridCard(); + AppUser appUser=appUserService.selectAppuserByIdcard(idCard); + if(appUser==null){ + return AjaxResult.error("用户信息未完善,请完善身份证信息!"); + }else{ + jobCollection.setUserId(appUser.getUserId()); + } + } + return success(jobCollectionService.selectJobCollectionListJob(jobCollection)); + } + + @ApiOperation("获取用户岗位申请列表") + @GetMapping("/getAppUserYhsq") + public AjaxResult getAppUserYhsq(JobApply jobApply) + { + if(!SecurityUtils.isLogin()){ + return AjaxResult.error("用户未登录!"); + } + if(jobApply.getUserId()==null){ + String idCard=RoleUtils.getCurrentUseridCard(); + AppUser appUser=appUserService.selectAppuserByIdcard(idCard); + if(appUser==null){ + return AjaxResult.error("用户信息未完善,请完善身份证信息!"); + }else{ + jobApply.setUserId(appUser.getUserId()); + } + } + return success(iJobApplyService.selectJobApplyListJob(jobApply)); + } + + @ApiOperation("获取用户岗位访问足迹列表") + @GetMapping("/getAppUserYhfwzj") + public AjaxResult getAppUserYhfwzj(AppReviewJob appReviewJob) + { + if(!SecurityUtils.isLogin()){ + return AjaxResult.error("用户未登录!"); + } + if(appReviewJob.getUserId()==null){ + String idCard=RoleUtils.getCurrentUseridCard(); + AppUser appUser=appUserService.selectAppuserByIdcard(idCard); + if(appUser==null){ + return AjaxResult.error("用户信息未完善,请完善身份证信息!"); + }else{ + appReviewJob.setUserId(appUser.getUserId()); + } + } + return success(iAppReviewJobService.selectAppReviewJobListJob(appReviewJob)); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppReviewJobMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppReviewJobMapper.java index 20c7dba..ef3a071 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppReviewJobMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppReviewJobMapper.java @@ -26,4 +26,6 @@ public interface AppReviewJobMapper extends BaseMapper List review(@Param("userId")Long userId, @Param("jobQuery") MineJobQuery jobQuery); List reviewArray(Long userId); + + List selectAppReviewJobListJob(AppReviewJob appReviewJob); } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java index 226d896..dbe438f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; import java.util.Map; -import com.ruoyi.cms.domain.vo.MyChart; +import com.ruoyi.common.core.domain.entity.MyChart; import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.common.core.domain.entity.SysUser; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java index 26ea3fb..95a8beb 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java @@ -35,4 +35,6 @@ public interface JobApplyMapper extends BaseMapper List selectAppUserList(Job job); List selectApplyJobUserList(AppUser appUser); + + List selectJobApplyListJob(JobApply jobApply); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobCollectionMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobCollectionMapper.java index 3272d6a..b8184aa 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobCollectionMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobCollectionMapper.java @@ -22,4 +22,6 @@ public interface JobCollectionMapper extends BaseMapper public List selectJobCollectionList(JobCollection jobCollection); List collectionJob(Long userId); + + public List selectJobCollectionListJob(JobCollection jobCollection); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppReviewJobService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppReviewJobService.java index 4624537..8a9ef30 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppReviewJobService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppReviewJobService.java @@ -59,4 +59,6 @@ public interface IAppReviewJobService List reviewArray(); + + List selectAppReviewJobListJob(AppReviewJob appReviewJob); } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java index cfecd5c..dcb34d0 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java @@ -2,7 +2,7 @@ package com.ruoyi.cms.service; import java.util.List; -import com.ruoyi.cms.domain.vo.MyChart; +import com.ruoyi.common.core.domain.entity.MyChart; import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.cms.domain.vo.AppUserLky; import com.ruoyi.common.core.domain.model.RegisterBody; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java index b39504e..e5951ab 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java @@ -68,4 +68,6 @@ public interface IJobApplyService public int applyComJob(JobApply jobApply); + + public List selectJobApplyListJob(JobApply jobApply); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobCollectionService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobCollectionService.java index 5731ccf..fc289b0 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobCollectionService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobCollectionService.java @@ -79,4 +79,6 @@ public interface IJobCollectionService * @return */ int pcJobCollection(JobCollection collection); + + public List selectJobCollectionListJob(JobCollection jobCollection); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppReviewJobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppReviewJobServiceImpl.java index ced8374..1f8450e 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppReviewJobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppReviewJobServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -100,4 +101,9 @@ public class AppReviewJobServiceImpl extends ServiceImpl appReviewJobs = appReviewJobMapper.reviewArray(SiteSecurityUtils.getUserId()); return appReviewJobs.stream().map(x -> formatter.format(x.getReviewDate())).collect(Collectors.toList()); } + + @Override + public List selectAppReviewJobListJob(AppReviewJob appReviewJob) { + return appReviewJobMapper.selectAppReviewJobListJob(appReviewJob); + } } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java index 5369abb..fb98e2f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.cms.domain.vo.MyChart; +import com.ruoyi.common.core.domain.entity.MyChart; import com.ruoyi.common.core.domain.entity.File; import com.ruoyi.cms.domain.vo.AppSkillVo; import com.ruoyi.cms.mapper.*; @@ -265,10 +265,15 @@ public class AppUserServiceImpl extends ServiceImpl imple List skillList=appSkillMapper.getList(parmsk); appUser.setAppSkillsList(skillList); + //查询附件 File fileParm=new File(); fileParm.setBussinessId(appUser.getUserId()); List files=fileMapper.selectFileList(fileParm); appUser.setFileList(files); + + //查询足迹 + MyChart myChart=appUserMapper.getMyTj(appUser.getUserId()); + appUser.setMyChart(myChart); } return appUser; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java index 3dc8391..400793a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; @@ -147,4 +148,9 @@ public class JobApplyServiceImpl extends ServiceImpl im jobApplyMapper.insert(jobApply); return 0; } + + @Override + public List selectJobApplyListJob(JobApply jobApply) { + return jobApplyMapper.selectJobApplyListJob(jobApply); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobCollectionServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobCollectionServiceImpl.java index ac7b9b8..cdd138c 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobCollectionServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobCollectionServiceImpl.java @@ -402,4 +402,9 @@ public class JobCollectionServiceImpl extends ServiceImpl selectJobCollectionListJob(JobCollection jobCollection) { + return jobCollectionMapper.selectJobCollectionListJob(jobCollection); + } } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppReviewJobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppReviewJobMapper.xml index 1ba16be..a02f4f6 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/AppReviewJobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppReviewJobMapper.xml @@ -42,4 +42,13 @@ and r.del_flag = '0' group by r.review_date + + + \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml index ce40d9d..a6a5ef0 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml @@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - SELECT t1.yzj,t2.ysc,t3.ytd,0 AS yyy FROM (SELECT COUNT(user_id) AS yzj FROM app_review_job WHERE user_id = #{userId} AND del_flag = '0') t1 CROSS JOIN (SELECT COUNT(user_id) AS ysc FROM job_collection WHERE user_id = #{userId} AND del_flag = '0') t2 diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml index 8e80d17..788830a 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml @@ -116,4 +116,12 @@ and b.job_title like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%') + + \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobCollectionMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobCollectionMapper.xml index f49230a..bea67b3 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobCollectionMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobCollectionMapper.xml @@ -37,4 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag = '0' and user_id = #{userId} order by create_time desc) + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java index dea65c1..e44acca 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java @@ -146,4 +146,7 @@ public class AppUser extends BaseEntity @TableField(exist = false) @ApiModelProperty("附件列表") private List fileList; + + @TableField(exist = false) + private MyChart myChart; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/MyChart.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MyChart.java similarity index 76% rename from ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/MyChart.java rename to ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MyChart.java index 91477c8..a0a9e5c 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/MyChart.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MyChart.java @@ -1,4 +1,4 @@ -package com.ruoyi.cms.domain.vo; +package com.ruoyi.common.core.domain.entity; import lombok.Data;