Merge branch 'master' of http://39.98.153.250:9080/bowintek/EmploymentSite

h5app/src/utils/position.ts

@@ -38,7 +38,7 @@ export function getPosition() {
                 reject(arguments)
             }, {
                 enableHighAccuracy: true,
-                timeout: 3000
+                timeout: 10000
             })
         } else {
             reject('你的浏览器不支持当前地理位置信息获取')

src/main/java/com/hz/employmentsite/vo/companyService/PostVo.java

@@ -1,16 +1,29 @@
 package com.hz.employmentsite.vo.companyService;
 
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 import com.hz.employmentsite.util.datarange.annotations.PostID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 @Data
 public class PostVo {
 
     @PostID
     public String postID;
 
+    @SiteID
+    private String siteID;
+
+    @InstitutionID
+    public String institutionID;
+
+    @RegionID
+    private String regionCode;
+
     public String workCode;
 
     public String workName;

src/main/java/com/hz/employmentsite/vo/jobUserManager/JobHuntVo.java

@@ -1,7 +1,11 @@
 package com.hz.employmentsite.vo.jobUserManager;
 
-import lombok.Data;
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 import com.hz.employmentsite.util.datarange.annotations.JobHuntID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
+import lombok.Data;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -33,5 +37,13 @@ public class JobHuntVo {
     public String recommendNum; // 推荐数量
     public String cultureRank;
 
+    // 数据权限
+    @SiteID
+    private String siteID;
+    @InstitutionID
+    public String institutionID;
+    @RegionID
+    private String regionCode;
+
     public String loginUserID;
 }

src/main/java/com/hz/employmentsite/vo/jobUserManager/JobUserVo.java

@@ -1,6 +1,9 @@
 package com.hz.employmentsite.vo.jobUserManager;
 
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 import com.hz.employmentsite.util.datarange.annotations.JobUserID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
 import lombok.Data;
 
 import java.util.Date;
@@ -13,8 +16,12 @@ public class JobUserVo {
     @JobUserID
     private String jobUserID;
 
+    @SiteID
     private String siteID;
 
+    @InstitutionID
+    public String institutionID;
+
     private String identityNumber;
 
     private String name;
@@ -63,6 +70,7 @@ public class JobUserVo {
 
     private String provinceCode;
 
+    @RegionID
     private String regionCode;
 
     private String regionName;

src/main/java/com/hz/employmentsite/vo/jobUserManager/RecommendMgtVo.java

@@ -1,10 +1,11 @@
 package com.hz.employmentsite.vo.jobUserManager;
 
 import com.hz.employmentsite.model.PcRecommendMgt;
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class RecommendMgtVo extends PcRecommendMgt {
     public String companyName;
@@ -23,4 +24,12 @@ public class RecommendMgtVo extends PcRecommendMgt {
     public String jobuserId;
     public String companyId;
     public Integer workYear;
+
+    // 数据权限
+    @SiteID
+    private String siteID;
+    @InstitutionID
+    public String institutionID;
+    @RegionID
+    private String regionCode;
 }

src/main/java/com/hz/employmentsite/vo/taskAndLog/DoTaskVo.java

@@ -1,10 +1,12 @@
 package com.hz.employmentsite.vo.taskAndLog;
 
-import lombok.Data;
 import com.hz.employmentsite.util.datarange.annotations.DoTaskID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
+import lombok.Data;
+
 import java.util.Date;
 import java.util.List;
-import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 
 @Data
 public class DoTaskVo {
@@ -32,6 +34,7 @@ public class DoTaskVo {
     
     public String streetName;
 
+    @RegionID
     public String regionCode;
 
     public String streetCode;

src/main/java/com/hz/employmentsite/vo/taskAndLog/DoWorkVo.java

@@ -1,7 +1,11 @@
 package com.hz.employmentsite.vo.taskAndLog;
 
-import lombok.Data;
 import com.hz.employmentsite.util.datarange.annotations.DoWorkID;
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
+import lombok.Data;
+
 import java.sql.Date;
 
 @Data
@@ -26,6 +30,7 @@ public class DoWorkVo {
     public String modifyUserID;
     public Date modifyTime;
 
+    @RegionID
     public String regionCode;
     public String regionName;
 
@@ -34,4 +39,9 @@ public class DoWorkVo {
 
     public Integer RecordsCompanyNum;
     public Integer RecordsJobuserNum;
+
+    @SiteID
+    private String siteID;
+    @InstitutionID
+    public String institutionID;
 }

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

@@ -13,12 +13,16 @@
         SELECT COUNT(jobuser.JobuserID) FROM pc_jobuser jobuser WHERE jobuser.CreateUserID = siteUser.UserId AND
         DATE(jobuser.CreateTime) = DATE(workLog.WorkTime)
         ) AS RecordsJobuserNum
+        ,site.SiteID as siteID,inSites.InstitutionID as institutionID
         from pc_dowork workLog
         left join (select * from sys_dictionary_item where DictionaryCode ='LogType' ) dic_logType on workLog.doTypeID =
         dic_logType.Value
         left join area_code region on workLog.RegionCode = region.code
         left join area_code street on workLog.StreetCode = street.code
         left join pc_site_user siteUser on workLog.SiteUserID = siteUser.SiteUserID
+        left join pc_site site on siteUser.siteID = site.siteID
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         where 1=1
         <if test="doWorkIDList!='' and doWorkIDList!=null">
             and doworkID in (${doWorkIDList})

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

@@ -9,8 +9,12 @@
         ,jobUser.name as JobUserName,dic_jobUserType.Name as jobUserTypeStr,dic_huntJobType.Name as jobHuntTypeStr
         ,profession.ProfessionName, profession.ParentProfessionID, IFNULL(count(rmgt.RecommendMgtID),0) as recommendNum
         ,jobUser.cultureRank
+        , site.SiteID as siteID, inSites.InstitutionID as institutionID, site.RegionCode as regionCode
         from pc_jobhunt jobHunt
         left join pc_jobuser jobUser on jobHunt.JobUserID = jobUser.JobUserID
+        left join pc_site site on site.SiteID = jobuser.SiteID
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         left join pc_profession profession on jobHunt.professionID = profession.professionID
         left join pc_recommend_mgt rmgt on jobHunt.JobHuntID = rmgt.JobHuntID
         left join (select * from sys_dictionary_item where DictionaryCode ='JobUserType') dic_jobUserType on
@@ -55,11 +59,13 @@
         <if test="isAccomplish != '' and isAccomplish != null">
             and rmgt.EntryState = #{isAccomplish}
         </if>
-        group by jobHunt.JobHuntID, jobHunt.JobUserID, jobHunt.ProfessionID, jobHunt.WorkCode, jobHunt.WorkName,
-        jobHunt.AreaWork, jobHunt.InDate, jobHunt.WorkYear, jobHunt.JobHuntType, jobHunt.JobUserType, jobHunt.MinSalary,
-        jobHunt.MaxSalary, jobHunt.CreateUserID, jobHunt.CreateTime, jobHunt.ModifyUserID, jobHunt.ModifyTime,
-        jobHunt.OtherDemand
-        ,jobUser.`Name`,dic_jobUserType.`Name`,dic_huntJobType.`Name`, profession.ProfessionName, profession.ParentProfessionID,jobUser.cultureRank
         order by jobHunt.CreateTime desc
     </select>
+    <!--    getJobHuntList的分组
+    group by jobHunt.JobHuntID, jobHunt.JobUserID, jobHunt.ProfessionID, jobHunt.WorkCode, jobHunt.WorkName,
+            jobHunt.AreaWork, jobHunt.InDate, jobHunt.WorkYear, jobHunt.JobHuntType, jobHunt.JobUserType, jobHunt.MinSalary,
+            jobHunt.MaxSalary, jobHunt.CreateUserID, jobHunt.CreateTime, jobHunt.ModifyUserID, jobHunt.ModifyTime,
+            jobHunt.OtherDemand
+            ,jobUser.`Name`,dic_jobUserType.`Name`,dic_huntJobType.`Name`, profession.ProfessionName, profession.ParentProfessionID,jobUser.cultureRank
+    -->
 </mapper>

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

@@ -2,7 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.hz.employmentsite.mapper.cquery.JobUserCQuery">
     <select id="selectJobUserList" resultType="com.hz.employmentsite.vo.jobUserManager.JobUserVo">
-        select jobuser.* ,gender.name as GenderName,culture.name as CultureName,site.SiteName,jobstatus.name as
+        select jobuser.* ,gender.name as GenderName,culture.name as
+        CultureName,
+        site.SiteName,inSites.InstitutionID as institutionID,
+        jobstatus.name as
         JobStatusName,keytype.name as KeyTypeName,sys_politics.name as politicsStatusName,sys_health.name as healthName,
         sys_family.name as familyNatureName,sys_full_time.Name as isFullTimeName,occ_cat.OccupationalName as
         occupationalCategoryName,
@@ -42,6 +45,8 @@
         jobuser.MaritalStatusID = sys_marital_status.Value
         left join area_code area_region on jobuser.RegionCode = area_region.code
         left join area_code area_street on jobuser.StreetCode = area_street.code
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         where 1=1
         <if test="jobUserIDList != '' and jobUserIDList != null">
             and jobuser.jobuserID in (${jobUserIDList})

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

@@ -8,9 +8,13 @@
         post.TrailMaxSalary,post.trailMinSalary,post.createUserID,post.createTime,post.modifyUserID,post.modifyTime,post.validTime,post.startTime,post.endTime,
         post.contactName,post.contactMobile,post.contactEmail,
         post.jobPlace,post.contactName,post.contactMobile,post.contactEmail,post.workNatureID,post.tagID,company.userName,company.userMobile,company.companyEmail,
+        company.CompanyName,company.insuredCount,company.bonus,item.`Name` as cultureLevelName,work_nature.Name as
+        workNatureName,
+        post.ProfessionID,pro.ProfessionName,pro.parentProfessionID,
         company.CompanyName,company.insuredCount,company.bonus,item.`Name` as cultureLevelName,work_nature.Name as workNatureName,
         post.ProfessionID,pro.ProfessionName,pro.parentProfessionID,item2.`Name` as workYearStr
         , IFNULL(count(rmgt.RecommendMgtID),0) as recommendNum
+        , site.SiteID as siteID,inSites.InstitutionID as institutionID, company.RegionCode as regionCode
         from pc_post post
         left join pc_company company on post.CompanyID = company.CompanyID
         left join sys_dictionary_item item on item.value=post.CultureRank and item.DictionaryCode='CultureLevel'
@@ -19,6 +23,9 @@
         work_nature.DictionaryCode='WorkNature'
         left join pc_profession pro on post.ProfessionID = pro.ProfessionID
         left join pc_recommend_mgt rmgt on post.PostID = rmgt.PostID
+        left join pc_site site on company.siteID = site.siteID
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         <where>
             <if test="postIDList != '' and postIDList != null">
                 and post.postID in (${postIDList})
@@ -42,14 +49,16 @@
                 and post.CompanyID = #{companyID}
             </if>
         </where>
-        group by
-        post.postID,post.workCode,post.workName,post.recruitCount,post.companyID,post.postName,post.recordStatus,post.workNature,post.validDay,
-        post.workYear,post.cultureRank,post.postDesc,post.maxSalary,post.minSalary,post.welfare,post.postEmail,post.workTime,post.isTrail,post.trailMonths,
-        post.TrailMaxSalary,post.trailMinSalary,post.createUserID,post.createTime,post.modifyUserID,post.modifyTime,post.validTime,post.startTime,post.endTime,
-        post.jobPlace,company.userName,company.userMobile,company.companyEmail,company.CompanyName,company.insuredCount,item.`Name`,
-        post.ProfessionID,pro.ProfessionName,pro.parentProfessionID,item2.`Name`
         order by post.CreateTime desc
     </select>
+    <!-- selectPostList的分组
+            group by
+            post.postID,post.workCode,post.workName,post.recruitCount,post.companyID,post.postName,post.recordStatus,post.workNature,post.validDay,
+            post.workYear,post.cultureRank,post.postDesc,post.maxSalary,post.minSalary,post.welfare,post.postEmail,post.workTime,post.isTrail,post.trailMonths,
+            post.TrailMaxSalary,post.trailMinSalary,post.createUserID,post.createTime,post.modifyUserID,post.modifyTime,post.validTime,post.startTime,post.endTime,
+            post.jobPlace,company.userName,company.userMobile,company.companyEmail,company.CompanyName,company.insuredCount,item.`Name`,
+            post.ProfessionID,pro.ProfessionName,pro.parentProfessionID
+     -->
     <select id="selectRecommendPostList" resultType="com.hz.employmentsite.vo.companyService.RecommendPostVo">
         select post.*,
                recommend.recommendID,

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

@@ -10,6 +10,7 @@
         dic4.`name` as jobpeopleisreadname,g.`name` as pushname, dic5.`name` as gendername
         ,e.jobuserId,c.companyId
         ,d.workYear
+        ,site.SiteID as siteID,inSites.InstitutionID as institutionID,site.RegionCode as regionCode
         from pc_recommend_mgt a
         inner join pc_post b on a.PostID = b.PostID
         left join pc_company c on b.CompanyID = c.CompanyID
@@ -28,6 +29,9 @@
         left join (select `Value`,`Name` from sys_dictionary_item where DictionaryCode='Gender') dic5 on e.Sex =
         dic5.`Value`
         left join sys_user g on a.CreateUserID = g.UserID
+        left join pc_site site on site.SiteID = e.SiteID
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         <where>
             <if test="recommendMgtID != '' and recommendMgtID != null">
                 and a.RecommendMgtID = #{recommendMgtID}