Merge remote-tracking branch 'origin/master'

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

@@ -578,6 +578,8 @@ export default defineComponent({
     const baseDataRule = computed(()=>{
       return {baseData:{
           siteID:{required},
+          regionCode:{required},
+          streetCode:{required},
           name:{required},
           identityNumber:{required},
           sex:{required},

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

@@ -594,6 +594,8 @@ export default defineComponent({
     const baseDataRule = computed(()=>{
       return {baseData:{
           siteID:{required},
+          regionCode:{required},
+          streetCode:{required},
           name:{required},
           identityNumber:{required},
           sex:{required},

h5app/src/views/pages/jobhunt/recommend/recommendPost.vue

@@ -59,7 +59,7 @@
         </div>
       </div>
       <b-empty v-if="dataList.length<=0" :loading="loading"/>
-      <ion-infinite-scroll threshold="50px" @ionInfinite="onScroll($event)">
+      <ion-infinite-scroll threshold="100px" @ionInfinite="onScroll($event)">
         <ion-infinite-scroll-content
             :loadingText="pagination.total>pagination.pageIndex*pagination.pageSize?'正在加载...':'暂无更多'"
             loadingSpinner="bubbles">
@@ -130,11 +130,6 @@ export default defineComponent({
 
     const loadData = async function () {
       loading.value = true;
-      searchParams.jobHuntID = route.query.jobHuntID as any;
-      searchParams.jobUserName = route.query.jobUserName as any;
-      searchParams.professionID = route.query.professionID as any;
-      searchParams.professionName = route.query.professionName as any;
-      searchParams.type = route.query.type as any;
       getRecommendCompanyPostList(searchParams).then((data: any) => {
         dataList.value = dataList.value.concat(data.list);
         total.value = data.total;

h5app/src/views/pages/post/recommendJob.vue

@@ -51,7 +51,7 @@
         </div>
       </div>
       <b-empty v-if="dataList.length<=0" :loading="loading"/>
-      <ion-infinite-scroll threshold="50px" @ionInfinite="onScroll($event)">
+      <ion-infinite-scroll threshold="100px" @ionInfinite="onScroll($event)">
         <ion-infinite-scroll-content
             :loadingText="pagination.total>pagination.pageIndex*pagination.pageSize?'正在加载...':'暂无更多'"
             loadingSpinner="bubbles">
@@ -122,11 +122,6 @@ export default defineComponent({
 
     const loadData = async function () {
       loading.value = true;
-      searchParams.postID = route.query.postID as any;
-      searchParams.companyName = route.query.companyName as any;
-      searchParams.professionID = route.query.professionID as any;
-      searchParams.professionName = route.query.professionName as any;
-      searchParams.type = route.query.type as any;
       getRecommendJobList(searchParams).then((data: any) => {
         dataList.value = dataList.value.concat(data.list);
         total.value = data.total;

src/main/java/com/hz/employmentsite/controller/jobUserManager/RecommendMgtController.java

@@ -59,7 +59,7 @@ public class RecommendMgtController {
                                                     @RequestParam("jobHuntID") String jobHuntID, @RequestParam(required = false) String professionID,
                                                     @RequestParam(required = false) String companyName, @RequestParam("type") Integer type,
                                                     @RequestParam(required = false) String parentProfessionID, @RequestParam(required = false) Integer cultureRank,
-                                                    @RequestParam(required = false) Integer workYear, @RequestParam(required = false) Integer minSalary,
+                                                    @RequestParam(required = false) String workYear, @RequestParam(required = false) Integer minSalary,
                                                     @RequestParam(required = false) Integer maxSalary) {
         PageInfo<RecommendCompanyPostVo> result = recommendMgtService.getRecommendCompanyPostList(pageIndex, pageSize, jobHuntID, professionID, companyName, type, parentProfessionID, cultureRank, workYear, minSalary, maxSalary);
         return RespGenerstor.success(result);

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

@@ -39,7 +39,7 @@ public interface RecommendMgtCQuery {
     List<RecommendCompanyPostVo> getRecommendCompanyPostList(@Param("jobHuntID") String jobHuntID, @Param("professionID") String professionID,
                                                              @Param("companyName") String companyName, @Param("type") Integer type,
                                                              @Param("parentProfessionID") String parentProfessionID, @Param("cultureRank") Integer cultureRank,
-                                                             @Param("workYear") Integer workYear, @Param("minSalary") Integer minSalary,
+                                                             @Param("workYear") String workYear, @Param("minSalary") Integer minSalary,
                                                              @Param("maxSalary") Integer maxSalary);
 
     /**

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/RecommendMgtServiceImpl.java

@@ -97,7 +97,7 @@ public class RecommendMgtServiceImpl implements RecommendMgtService {
     @Override
     public PageInfo<RecommendCompanyPostVo> getRecommendCompanyPostList(Integer page, Integer rows, String jobHuntID, String professionID,
                                                                         String companyName, Integer type, String parentProfessionID, Integer cultureRank,
-                                                                        Integer workYear,Integer minSalary,Integer maxSalary) {
+                                                                        String workYear,Integer minSalary,Integer maxSalary) {
         PageHelper.startPage(page, rows);
         List<RecommendCompanyPostVo> list = recommendMgtCQuery.getRecommendCompanyPostList(jobHuntID, professionID, companyName, type,parentProfessionID,cultureRank,workYear,minSalary,maxSalary);
         list.forEach(x -> {

src/main/java/com/hz/employmentsite/services/service/jobUserManager/RecommendMgtService.java

@@ -43,7 +43,7 @@ public interface RecommendMgtService {
     PageInfo<RecommendCompanyPostVo> getRecommendCompanyPostList(Integer page, Integer rows, String jobHuntID,
                                                                  String professionID, String companyName, Integer type,
                                                                  String parentProfessionID, Integer cultureRank,
-                                                                 Integer workYear,Integer minSalary,Integer maxSalary);
+                                                                 String workYear,Integer minSalary,Integer maxSalary);
 
 
     /**

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

@@ -89,7 +89,7 @@
         left join pc_recommend_mgt d on a.PostID = d.PostID and d.JobHuntID = #{jobHuntID}
         left join (select `Value`,`Name` from sys_dictionary_item where DictionaryCode='CultureLevel') dic1 on
         a.CultureRank = dic1.`Value`
-        left join (select `Value`,`Name` from sys_dictionary_item where DictionaryCode='WorkYearType') dic2 on
+        left join (select `Value`,`Name`,`Code` from sys_dictionary_item where DictionaryCode='WorkYearType') dic2 on
         a.WorkYear = dic2.`Value`
         <where>
             <if test="type!=null and type==0">
@@ -113,19 +113,8 @@
             <if test="cultureRank!=null and cultureRank!=''">
                 and a.CultureRank <![CDATA[>=]]> #{cultureRank}
             </if>
-            <if test="workYear!=null">
-                <choose>
-                    <when test="workYear==1 or workYear==2">
-                        and a.WorkYear = 2
-                    </when>
-                    <when test="workYear==3 or workYear==4 or workYear==5">
-                        and a.WorkYear = 3
-                    </when>
-                    <when test="workYear>5">
-                        and a.WorkYear = 4
-                    </when>
-                    <otherwise>and 1=1</otherwise>
-                </choose>
+            <if test="workYear!=null and workYear!=''">
+                and CAST(dic2.`Code` as decimal(18,2)) <![CDATA[<=]]> 3.5
             </if>
             <choose>
                 <when test="minSalary!=null and maxSalary!=null">