web-求职意向推荐岗位企业、岗位详情页面查询数据范围调整

h5app/src/api/jobUserInfo/index.ts

@@ -24,12 +24,12 @@ export function getJobUserDataList(){
     );
 }
 
-export function getJobUserById(id: any,loginUserID:string) {
+export function getJobUserById(id: any,loginUserID:string, isAllJobUser: boolean) {
     return request(
         {
             url: 'jobUserService/jobUser/getDataByID',
             method: 'get',
-            params: {id,loginUserID},
+            params: {id,loginUserID,isAllJobUser},
         },
         { isNew: true },
     );

h5app/src/views/pages/jobUserInfo/userEdit.vue

@@ -875,7 +875,7 @@ export default defineComponent({
       curStepData.value.statusVal = status;
       curStepData.value.loginUserID = userId;
       if(curStepData.value.statusVal==1){
-        const reqData = await getJobUserById(jobUserID,userId);
+        const reqData = await getJobUserById(jobUserID,userId,true);
         baseInfoData.baseData = reqData;
         baseInfoData.baseData.openId = openId;
 

h5app/src/views/pages/jobhunt/detail.vue

@@ -372,7 +372,7 @@ export default defineComponent({
       curTabIndex.value = 1;
       curTitle.value ="求职人员详情";
       pageParams.jobUserID  = jobUserID;
-      const reqData = await getJobUserById(jobUserID,loginUserId);
+      const reqData = await getJobUserById(jobUserID,loginUserId,true);
       formData.dataModel = reqData;
       formData.dataModel.tagName = "";
       if(formData.dataModel.listLabel != null && formData.dataModel.listLabel.length>0){

h5app/src/views/pages/jobhunt/edit.vue

@@ -897,7 +897,7 @@ export default defineComponent({
       const curUserID = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       //console.log("当前jobUserID",jobUserID);
       if(curStepData.value.statusVal==1){
-        const reqData = await getJobUserById(jobUserID,curUserID);
+        const reqData = await getJobUserById(jobUserID,curUserID,true);
         isEdit.value = jobUserID != null;
         baseInfoData.baseData = reqData;
         baseInfoData.baseData.userMobile = crtyptoHelp.decryptDesText(baseInfoData.baseData.userMobile);

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -79,8 +79,8 @@ public class CompanyController {
     }
 
     @GetMapping("/getCompanyByID")
-    public BaseResponse<CompanyVo> getCompanyById(String id,String loginUserID) {
-        var data = companyService.getDataById(id);
+    public BaseResponse<CompanyVo> getCompanyById(String id,String loginUserID,boolean isAllCompany) {
+        var data = companyService.getDataById(id,isAllCompany);
         if (data == null) {
             data = new CompanyVo();
             data.companyID = UUID.randomUUID().toString();

src/main/java/com/hz/employmentsite/controller/companyService/PostController.java

@@ -98,8 +98,8 @@ public class PostController {
     }
 
     @GetMapping("/getPostByID")
-    public BaseResponse<PostVo> getPostById(@RequestParam(required = false) String id) {
-        var data = postService.getDataById(id);
+    public BaseResponse<PostVo> getPostById(@RequestParam(required = false) String id,@RequestParam(required = false) boolean isAllPost) {
+        var data = postService.getDataById(id,isAllPost);
         if (data == null) {
             data = new PostVo();
             data.postID = UUID.randomUUID().toString();

src/main/java/com/hz/employmentsite/mapper/cquery/CompanyCQuery.java

@@ -16,7 +16,7 @@ public interface CompanyCQuery {
                             @Param("curLoginUserSiteID") String curLoginUserSiteID, @Param("siteID") String siteID,
                             @Param("startDate") Date startDate, @Param("endDate") Date endDate,
                             @Param("postCountSorter") String postCountSorter, @Param("companyTypeID") String companyTypeID,
-                            @Param("industryID") String industryID);
+                            @Param("industryID") String industryID, @Param("isAllCompany") boolean isAllCompany);
 
     List<PcFirm> getFirmNameLikeList(@Param("firmName") String firmName);
 

src/main/java/com/hz/employmentsite/mapper/cquery/PostCQuery.java

@@ -14,7 +14,7 @@ public interface PostCQuery {
                                 @Param("companyName") String companyName, @Param("RecordStatus") String RecordStatus,
                                 @Param("companyID") String companyID, @Param("curLoginUserSiteCompanyIDs") String curLoginUserSiteCompanyIDs,
                                 @Param("siteID") String siteID, @Param("startDate") Date startDate,
-                                @Param("endDate") Date endDate);
+                                @Param("endDate") Date endDate,@Param("isAllPost") boolean isAllPost);
 
     List<RecommendPostVo> selectRecommendPostList(@Param("jobUserID") String jobUserID);
 

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -93,7 +93,7 @@ public class CompanyServiceImpl implements CompanyService {
             curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
         }
         PageHelper.startPage(pageIndex, pageSize);
-        List<CompanyVo> dataList = companyCQuery.getList(stringUtils.ListToInSql(companyIDList), companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime, curLoginUserSiteID, siteID, startDate, endDate, postCountSorter, companyTypeID, industryID);
+        List<CompanyVo> dataList = companyCQuery.getList(stringUtils.ListToInSql(companyIDList), companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime, curLoginUserSiteID, siteID, startDate, endDate, postCountSorter, companyTypeID, industryID,false);
         PageInfo<CompanyVo> result = new PageInfo(dataList);
         return result;
     }
@@ -302,12 +302,12 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
     @Override
-    public CompanyVo getDataById(String id) {
+    public CompanyVo getDataById(String id,boolean isAllCompany) {
         if (stringUtils.IsNullOrEmpty(id)) {
             return null;
         }
 
-        CompanyVo data = companyCQuery.getList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null, null, null,null,null).stream().findFirst().orElse(null);
+        CompanyVo data = companyCQuery.getList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null, null, null,null,null, isAllCompany).stream().findFirst().orElse(null);
         if(data!=null){
             data.listLabel = labelCQuery.getCompanyLabelList(id);
         }

src/main/java/com/hz/employmentsite/services/impl/companyService/PostServiceImpl.java

@@ -82,7 +82,7 @@ public class PostServiceImpl implements PostService {
             }
         }
         PageHelper.startPage(page, rows);
-        List<PostVo> list = postCQuery.selectPostList(stringUtils.ListToInSql(postIDList), professionName, minCount, maxCount, companyName, recordStatus, companyID, stringUtils.ListToInSql(curLoginUserSiteCompanyIDs), siteID, startDate, endDate);
+        List<PostVo> list = postCQuery.selectPostList(stringUtils.ListToInSql(postIDList), professionName, minCount, maxCount, companyName, recordStatus, companyID, stringUtils.ListToInSql(curLoginUserSiteCompanyIDs), siteID, startDate, endDate,false);
         if(list != null && list.size()>0){
             for(PostVo curPost : list){
                 curPost.listLabel = labelCQuery.getPostLabelList(curPost.getPostID());
@@ -346,12 +346,12 @@ public class PostServiceImpl implements PostService {
     }
 
     @Override
-    public PostVo getDataById(String id) {
+    public PostVo getDataById(String id,boolean isAllPost) {
         if (stringUtils.IsNullOrEmpty(id)) {
             return null;
         }
 
-        PostVo data = postCQuery.selectPostList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null).stream().findFirst().orElse(null);
+        PostVo data = postCQuery.selectPostList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null,isAllPost).stream().findFirst().orElse(null);
         if (data != null) {
             data.listLabel = labelCQuery.getPostLabelList(id);
         }

src/main/java/com/hz/employmentsite/services/service/companyService/CompanyService.java

@@ -29,7 +29,7 @@ public interface CompanyService {
 
     Integer delete(List<String> id);
 
-    CompanyVo getDataById(String id);
+    CompanyVo getDataById(String id,boolean isAllCompany);
 
     List<CompanyVo> importCompany(List<CompanyVo> dataList, String userID);
 

src/main/java/com/hz/employmentsite/services/service/companyService/PostService.java

@@ -23,7 +23,7 @@ public interface PostService {
 
     int delete(List<String> ids);
 
-    PostVo getDataById(String id);
+    PostVo getDataById(String id,boolean isAllPost);
 
     List<PostVo> getDataListByCompanyID(String companyID);
 

src/main/java/com/hz/employmentsite/util/datarange/DataRangeInterceptor.java

@@ -85,7 +85,8 @@ public class DataRangeInterceptor implements Interceptor {
                     if(mainSql.contains("task.dotaskID,task.siteID")){
                         whereClause += " or x.siteID is null ";
                     }
-                    if(mainSql.contains("site.siteName = 'AllSite'")||mainSql.contains("JobUserID = 'AllJobUser'")){
+                    if(mainSql.contains("SiteID = 'AllSite'")||mainSql.contains("JobUserID = 'AllJobUser'")||
+                       mainSql.contains("companyID = 'AllCompany'")||mainSql.contains("postID = 'AllPost'")){
                         whereClause = " where 1=1 ";
                     }
                     mainSql = "select x.* from" +

src/main/resources/mapping/cquery/CompanyCQuery.xml

@@ -81,6 +81,9 @@
             and company.CreateTime <![CDATA[ >= ]]> #{startDate}
             and company.CreateTime <![CDATA[ <= ]]> #{endDate}
         </if>
+        <if test="isAllCompany != null and isAllCompany == true ">
+            or company.companyID = 'AllCompany'
+        </if>
         order by
         <if test="postCountSorter == null or postCountSorter == ''">
             company.CreateTime desc,

src/main/resources/mapping/cquery/PostCQuery.xml

@@ -63,6 +63,9 @@
                 and post.CreateTime <![CDATA[ >= ]]> #{startDate}
                 and post.CreateTime <![CDATA[ <= ]]> #{endDate}
             </if>
+            <if test="isAllPost != null and isAllPost == true ">
+                or post.postID = 'AllPost'
+            </if>
         </where>
         group by
         post.postID,post.workCode,post.workName,post.recruitCount,post.companyID,post.postName,post.recordStatus,post.workNature,post.validDay,

src/main/resources/mapping/cquery/SiteInfoCQuery.xml

@@ -54,7 +54,7 @@
         left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         left join area_code region on site.RegionCode = region.code
         left join area_code street on site.StreetCode = street.code
-        where 1=1 or site.siteName = 'AllSite'  order by site.CreateTime desc
+        where 1=1 or site.SiteID = 'AllSite'  order by site.CreateTime desc
     </select>
     <select id="getListByInstitutionID" resultType="com.hz.employmentsite.vo.baseSettings.SiteInfoVo">
         select  A.*,B.SiteInstitutionID,C.InstitutionID from pc_site A,pc_site_institution B,pc_institution C

vue/src/api/companyService/company.ts

@@ -14,11 +14,11 @@ export function getList(params: any) {
   );
 }
 
-export function getCompanyById(id: string, loginUserID: any) {
+export function getCompanyById(id: string, loginUserID: any,isAllCompany: boolean) {
   return request({
     url: 'companyService/company/getCompanyByID',
     method: 'get',
-    params: {id, loginUserID}
+    params: {id, loginUserID,isAllCompany}
   }, {
     isNew: true
   })

vue/src/api/companyService/post.ts

@@ -14,11 +14,11 @@ export function getList(params: any) {
   );
 }
 
-export function getPostByID(id: string) {
+export function getPostByID(id: string,isAllPost: boolean) {
   return request<object>({
     url: 'companyService/post/getPostByID',
     method: 'get',
-    params: {id: id}
+    params: {id: id,isAllPost:isAllPost}
   }, {
     isNew: true
   })

vue/src/views/companyService/company/edit.vue

@@ -743,7 +743,7 @@ export default defineComponent(
         getFirstIndustryList();
         getInfo().then((loginUserInfo:any)=>{
           console.log("userInfo",loginUserInfo.userID);
-          getCompanyById(id,loginUserInfo.userID).then(result => {
+          getCompanyById(id,loginUserInfo.userID,true).then(result => {
             formState.dataModel = result;
             formState.dataModel.hasIndustry = true;
             console.log("curDataModel",formState.dataModel);

vue/src/views/companyService/post/edit.vue

@@ -538,7 +538,7 @@ export default defineComponent(
         getJobHuntList();
         getFirstWorkCategoryList();
         getFirstProfessionList();
-        getPostByID(id).then(result => {
+        getPostByID(id,true).then(result => {
           console.log("初始化岗位信息",result);
           postCompany.dataModel = result;
           postCompany.dataModel.hasProfession = true;
@@ -569,7 +569,7 @@ export default defineComponent(
       // 企业名称选择变更事件
       function companyChange(value: any) {
         getInfo().then((loginUserInfo: any) => {
-          getCompanyById(value, loginUserInfo.userID).then(result => {
+          getCompanyById(value, loginUserInfo.userID,true).then(result => {
             console.log(result);
             postCompany.dataModel.welfare = result.bonus;
           })

vue/src/views/jobUserManager/jobhunt/companyDetail.vue

@@ -95,7 +95,7 @@ export default defineComponent({
 
     //数据加载
     const show = async function (id: any) {
-      getCompanyById(id, "").then(result => {
+      getCompanyById(id, "",true).then(result => {
         companyInfo.dataModel = result;
         visible.value = true;
       });

vue/src/views/jobUserManager/jobhunt/postDetail.vue

@@ -93,7 +93,7 @@ export default defineComponent({
 
     // 数据加载
     const show = async function (id: any)  {
-      getPostByID(id).then(result => {
+      getPostByID(id,true).then(result => {
         postInfo.dataModel = result;
         visible.value = true;
       });