Merge remote-tracking branch 'origin/master'

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

@@ -75,6 +75,7 @@ import {arrowBackOutline} from 'ionicons/icons';
 import {getListById, setEntryState,saveRemark} from '@/api/recommendmgt/index'
 import {onIonViewDidEnter} from '@ionic/vue'
 import {getSysDictionaryList} from "@/api/system/dictionary";
+import crtyptoHelp from "@/utils/crypto";
 
 interface RecommendModel {
   companyMobile: string,
@@ -141,6 +142,7 @@ export default defineComponent({
       entryStateList.value = entryStateResult;
       getListById(id).then((data) => {
         dataModel.value = data;
+        dataModel.value.userMobile = crtyptoHelp.decryptDesText(dataModel.value.userMobile);
       })
       loading.value = false;
     }

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

@@ -183,7 +183,7 @@ public class RecommendMgtServiceImpl implements RecommendMgtService {
         PcRecommendMgtExample recommendMgtExp = new PcRecommendMgtExample();
         recommendMgtExp.or().andPostIDEqualTo(postID);
         var recommendedList = pcRecommendMgtMapper.selectByExample(recommendMgtExp);
-        if( recommendedList.size()>0){
+        if( recommendedList.size()>0 && type.equals(0)){
             for(PcRecommendMgt curRecommended:recommendedList){
                 recommendedJobHuntIDList.add(curRecommended.getJobHuntID());
             }

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

@@ -2,6 +2,8 @@ package com.hz.employmentsite.vo.jobUserManager;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class RecommendCompanyPostVo {
     public String recommendMgtID;
@@ -14,8 +16,8 @@ public class RecommendCompanyPostVo {
     public String isRecommend;
     public String companyAddress;
     public String professionID;
-    public String maxSalary;
-    public String minSalary;
+    public BigDecimal maxSalary;
+    public BigDecimal minSalary;
     public String cultureRankName;
     public String workYearName;
 }

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

@@ -2,6 +2,8 @@ package com.hz.employmentsite.vo.jobUserManager;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class RecommendJobVo {
     public String recommendMgtID;
@@ -15,6 +17,6 @@ public class RecommendJobVo {
     public String professionID;
     public String professionName;
     public String workYear;
-    public String minSalary;
-    public String maxSalary;
+    public BigDecimal minSalary;
+    public BigDecimal maxSalary;
 }

vue/src/views/companyService/post/index.vue

@@ -312,7 +312,10 @@ export default defineComponent({
     };
 
     const onRecommendInfo = (item) =>{
-      recommendRef.value.show('','',item.professionName,item.postID,item.companyName,1,'求职人员信息');
+      if(item.recommendNum == 0){
+        return;
+      }
+      recommendRef.value.show('','',item.professionName,item.postID,item.companyName,1,'已推荐求职人员信息');
     }
 
     const handleTableChange: TableProps['onChange'] = (pag: { pageSize: number; current: number },) => {

vue/src/views/companyService/post/recommend.vue

@@ -118,7 +118,7 @@
         </a-row>
         <a-row class="edit-operation">
           <a-col :span="24" style="text-align: right">
-            <a-button type="primary" html-type="submit" v-if="searchParams.type===0" functioncode="T01030202"
+            <a-button type="primary" html-type="submit" v-if="searchParams.type===0" functioncode="T01020206"
                       @click='onBatchRecommend()'>批量推荐
             </a-button>
           </a-col>
@@ -244,6 +244,7 @@ export default defineComponent({
       formState.loading = true;
       const result: any = await getRecommendJobList(searchParams);
       dataList.value = result.list;
+      console.log(dataList);
       formState.total = result.total;
       formState.loading = false;
     };

vue/src/views/jobUserManager/jobhunt/index.vue

@@ -249,14 +249,14 @@ export default defineComponent({
           `${searchParamsState.pageSize * (searchParamsState.pageIndex - 1) + item.index + 1}`,
         isDisabled: true
       },
-      {title: '姓名', dataIndex: 'jobUserName', key: 'jobUserName', width: 100, align: "center",},
-      {title: '希望工作地区', dataIndex: 'areaWork', key: 'areaWork', width: 150, align: "center",},
-      {title: '工作年限', dataIndex: 'workYear', key: 'workYear', align: "center",},
+      {title: '姓名', dataIndex: 'jobUserName', key: 'jobUserName', width: 120, align: "center",},
+      {title: '希望工作地区', dataIndex: 'areaWork', key: 'areaWork', width: 180, align: "center",},
+      {title: '工作年限', dataIndex: 'workYear', key: 'workYear', width: 140, align: "center",},
       {title: '求职类型', dataIndex: 'jobHuntTypeStr', key: 'jobHuntTypeStr', align: "center",},
       {title: '求职岗位', dataIndex: 'professionName', key: 'professionName', align: "center",},
       {title: '推荐数量', dataIndex: 'recommendNum', key: 'recommendNum', align: "center"},
       {
-        title: '可到职日期', dataIndex: 'inDate', key: 'inDate', width: 100, align: "center",
+        title: '可到职日期', dataIndex: 'inDate', key: 'inDate', width: 120, align: "center",
         customRender: ({record}) => record.inDate == null ? "" : dayjs(record.inDate).format('YYYY-MM-DD'),
         isDefaultClose: true
       },
@@ -409,8 +409,11 @@ export default defineComponent({
     }
 
     const onRecommendInfo = (item) => {
+      if(item.recommendNum == 0){
+        return;
+      }
       recommendRef.value.show('', item.professionName, item.jobHuntID, item.jobUserName, 1,
-       '', null, null, null, null, '求职人员信息');
+       '', null, null, null, null, '已推荐企业岗位信息');
     }
 
     const getJobHuntTypeList = () => {

vue/src/views/jobUserManager/jobhunt/recommend.vue

@@ -80,7 +80,7 @@
         </a-row>
         <a-row class="edit-operation">
           <a-col :span="24" style="text-align: right">
-            <a-button type="primary" v-if="searchParams.type===0" html-type="submit" functioncode="T01030202"
+            <a-button type="primary" v-if="searchParams.type===0" html-type="submit" functioncode="T01030207"
                       @click='onBatchRecommend()'>批量推荐
             </a-button>
           </a-col>

vue/src/views/taskAndLog/dowork/index.vue

@@ -110,7 +110,7 @@
                @change="handleTableChange">
         <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'RecordsCompanyNum'">
-            <div class="table-operation">
+            <div>
               <a-button type="link" size="small" @click='onRecordsCompanyInfo(record)'>{{
                   record.RecordsCompanyNum
                 }}
@@ -118,7 +118,7 @@
             </div>
           </template>
           <template v-if="column.key === 'RecordsJobuserNum'">
-            <div class="table-operation">
+            <div >
               <a-button type="link" size="small" @click='onRecordsJobUserInfo(record)'>{{
                   record.RecordsJobuserNum
                 }}