推荐信息管理

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

@@ -23,7 +23,7 @@
           <ion-label>
             <h2>{{ record.name }}</h2>
             <ion-label style="display: flex;justify-content: space-between;">
-              <p>求职岗位：{{ record.professionName }}</p>
+              <p>求职岗位：{{ record.qzProfessionName }}</p>
               <p>{{ record.entryStateName }}</p>
             </ion-label>
             <p>招聘企业：{{ record.companyName }}</p>
@@ -56,7 +56,7 @@ import {useRoute, useRouter} from "vue-router";
 import {arrowBackOutline} from 'ionicons/icons';
 import {IonIcon, onIonViewDidEnter} from '@ionic/vue';
 import BEmpty from "@/components/empty.vue";
-import {getList, setEntryState} from '@/api/recommendmgt/index'
+import {getList} from '@/api/recommendmgt/index'
 
 export default defineComponent({
   name: 'recommendMgtList',

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

@@ -28,9 +28,10 @@ public class RecommendMgtController {
     public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                 @RequestParam(required = false) String name, @RequestParam(required = false) String companyName,
                                 @RequestParam(required = false) Integer recommendType, @RequestParam(required = false) Integer entryState,
-                                @RequestParam(required = false) String pushName, @RequestParam(required = false) String professionName) {
+                                @RequestParam(required = false) String pushName, @RequestParam(required = false) String qzProfessionName,
+                                @RequestParam(required = false) String zpProfessionName) {
 
-        PageInfo<RecommendMgtVo> result = recommendMgtService.getList(pageIndex, pageSize, name, companyName, recommendType, entryState, pushName, professionName);
+        PageInfo<RecommendMgtVo> result = recommendMgtService.getList(pageIndex, pageSize, name, companyName, recommendType, entryState, pushName, qzProfessionName, zpProfessionName);
         return RespGenerstor.success(result);
     }
 

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

@@ -16,7 +16,8 @@ public interface RecommendMgtCQuery {
                                              @Param("recommendType") Integer recommendType,
                                              @Param("entryState") Integer entryState,
                                              @Param("pushName") String pushName,
-                                             @Param("professionName") String professionName);
+                                             @Param("qzProfessionName") String qzProfessionName,
+                                             @Param("zpProfessionName") String zpProfessionName);
 
     /**
      * 获取推荐岗位信息

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

@@ -35,10 +35,10 @@ public class RecommendMgtServiceImpl implements RecommendMgtService {
     private WechatService wechatService;
 
     @Override
-    public PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name, String companyName, Integer recommendType, Integer entryState, String pushName, String professionName) {
+    public PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name, String companyName, Integer recommendType, Integer entryState, String pushName, String qzProfessionName, String zpProfessionName) {
         PageHelper.startPage(page, rows);
 
-        List<RecommendMgtVo> list = recommendMgtCQuery.getRecommendMgtList(null, name, companyName, recommendType, entryState, pushName, professionName);
+        List<RecommendMgtVo> list = recommendMgtCQuery.getRecommendMgtList(null, name, companyName, recommendType, entryState, pushName, qzProfessionName, zpProfessionName);
 
         PageInfo<RecommendMgtVo> result = new PageInfo(list);
 
@@ -47,7 +47,7 @@ public class RecommendMgtServiceImpl implements RecommendMgtService {
 
     @Override
     public RecommendMgtVo getListById(String recommendMgtID) {
-        RecommendMgtVo data = recommendMgtCQuery.getRecommendMgtList(recommendMgtID,null,null,null,null,null,null).stream().findFirst().orElse(null);
+        RecommendMgtVo data = recommendMgtCQuery.getRecommendMgtList(recommendMgtID,null,null,null,null,null,null, null).stream().findFirst().orElse(null);
         if(data==null){
             throw new BaseException("500","未查询到数据");
         }

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 
 public interface RecommendMgtService {
-    PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name, String companyName, Integer recommendType, Integer entryState, String pushName, String professionName);
+    PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name, String companyName, Integer recommendType, Integer entryState, String pushName, String qzProfessionName, String zpProfessionName);
 
     RecommendMgtVo getListById(String recommendMgtID);
 

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

@@ -45,8 +45,11 @@
             <if test="pushName != '' and pushName != null">
                 and g.Name like Concat('%',#{pushName},'%')
             </if>
-            <if test="professionName != '' and professionName != null">
-                and f.ProfessionName like Concat('%',#{professionName},'%')
+            <if test="qzProfessionName != '' and qzProfessionName != null">
+                and f.ProfessionName like Concat('%',#{qzProfessionName},'%')
+            </if>
+            <if test="zpProfessionName != '' and zpProfessionName != null">
+                and f2.ProfessionName like Concat('%',#{zpProfessionName},'%')
             </if>
         </where>
         order by a.createtime desc

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

@@ -166,8 +166,9 @@ export default defineComponent({
           `${searchParams.pageSize * (searchParams.pageIndex - 1) + item.index + 1}`,
       },
       {title: '企业名称', dataIndex: 'companyName', key: 'companyName', width: 100, align: "center",},
-      {title: '岗位名称', dataIndex: 'professionName', key: 'professionName', width: 150, align: "center",},
+      {title: '招聘岗位', dataIndex: 'professionName', key: 'professionName', width: 150, align: "center",},
       {title: '招聘人数', dataIndex: 'recruitCount', key: 'recruitCount', width: 150, align: "center",},
+      {title: '工作地点', dataIndex: 'companyAddress', key: 'companyAddress', width: 150, align: "center",},
       {
         title: '工作开始时间', dataIndex: 'startTime', key: 'startTime', width: 100, align: "center",
         customRender: ({record}) => record.startTime == null ? "" : dayjs(record.startTime).format('YYYY-MM-DD'),
@@ -176,7 +177,6 @@ export default defineComponent({
         title: '工作结束时间', dataIndex: 'endTime', key: 'endTime', width: 100, align: "center",
         customRender: ({record}) => record.endTime == null ? "" : dayjs(record.endTime).format('YYYY-MM-DD'),
       },
-      {title: '工作地点', dataIndex: 'companyAddress', key: 'companyAddress', width: 150, align: "center",},
       {title: '操作', key: 'operation', width: 60, align: 'center'},
     ];
     const pagination = computed(() => ({

vue/src/views/jobUserManager/recommendMgt/index.vue

@@ -68,13 +68,20 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="推送人" :label-col="{ span: 8 }" name="pushName">
-            <a-input v-model:value="searchParamsState.pushName" placeholder=""/>
+          <a-form-item label="招聘岗位" :label-col="{ span: 8 }" name="zpProfessionName">
+            <a-input v-model:value="searchParamsState.zpProfessionName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="岗位" :label-col="{ span: 8 }" name="professionName">
-            <a-input v-model:value="searchParamsState.professionName" placeholder=""/>
+          <a-form-item label="求职岗位" :label-col="{ span: 8 }" name="qzProfessionName">
+            <a-input v-model:value="searchParamsState.qzProfessionName" placeholder=""/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-show="expand">
+        <a-col :span="6">
+          <a-form-item label="推送人" :label-col="{ span: 8 }" name="pushName">
+            <a-input v-model:value="searchParamsState.pushName" placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -135,7 +142,8 @@ export default defineComponent({
       recommendType: null,
       entryState: null,
       pushName: '',
-      professionName: ''
+      zpProfessionName: '',
+      qzProfessionName: ''
     });
     const formState = reactive({
       total: 0,
@@ -151,12 +159,13 @@ export default defineComponent({
         customRender: (item) =>
           `${searchParamsState.pageSize * (searchParamsState.pageIndex - 1) + item.index + 1}`,
       },
-      {title: '求职者', dataIndex: 'name', key: 'name', width: 100},
-      {title: '求职者电话', dataIndex: 'userMobile', key: 'userMobile', width: 150},
-      {title: '岗位', dataIndex: 'professionName', key: 'professionName', width: 150},
-      {title: '企业', dataIndex: 'companyName', key: 'companyName', width: 150},
-      {title: '企业电话', dataIndex: 'companyMobile', key: 'companyMobile', width: 150},
-      {title: '推荐类型', dataIndex: 'recommendTypeName', key: 'recommendTypeName', width: 100},
+      {title: '求职者', dataIndex: 'name', key: 'name'},
+      {title: '求职者电话', dataIndex: 'userMobile', key: 'userMobile'},
+      {title: '求职岗位', dataIndex: 'qzProfessionName', key: 'qzProfessionName'},
+      {title: '企业', dataIndex: 'companyName', key: 'companyName'},
+      {title: '企业电话', dataIndex: 'companyMobile', key: 'companyMobile'},
+      {title: '招聘岗位', dataIndex: 'zpProfessionName', key: 'zpProfessionName'},
+      {title: '推荐类型', dataIndex: 'recommendTypeName', key: 'recommendTypeName'},
       {title: '入职状态', dataIndex: 'entryStateName', key: 'entryStateName'},
       {title: '推送人', dataIndex: 'pushName', key: 'pushName'},
       {