Browse Source

岗位信息推荐

lizeyu 11 months ago
parent
commit
a8c08c71d6

+ 17 - 0
h5app/src/App.vue

@@ -300,6 +300,23 @@ ion-grid {
       content: "选择";
       color: #02a6f1;
     }
+
+    ion-item{
+      ion-select{
+        border-bottom: 1px solid #f1f5f7;
+        color: #8c8f93;
+        --padding-start: 0px;
+      }
+
+      ion-select::part(icon){
+        display: none;
+      }
+
+      ion-select::after{
+        content: "选择";
+        color: #02a6f1;
+      }
+    }
   }
 
   .form-detail{

+ 1 - 0
h5app/src/api/account/model.d.ts

@@ -28,6 +28,7 @@ declare namespace API {
     userTypeName: string,
     loginID: string,
     name:string,
+    siteID:string,
     siteUserName:string,
     gender: 1,
     genderName: string,

+ 13 - 0
h5app/src/api/company/index.ts

@@ -1,5 +1,18 @@
 import {request} from "@/utils/request";
 
+//根据驿站查询公司
+export function getCompanyBySiteID(siteID: any) {
+    return request<any>(
+        {
+            url: "companyService/company/getCompanyBySiteIDList",
+            method: 'get',
+            params: {siteID:siteID},
+        },
+        {
+            isNew: true,
+        },
+    );
+}
 //获取所属驿站
 export function getSiteList(params: any) {
     return request<any>(

+ 4 - 0
h5app/src/router/index.ts

@@ -72,6 +72,10 @@ const routes: Array<RouteRecordRaw> = [
                 path: 'tabMain/post/list',
                 component: () => import('@/views/pages/post/list.vue')
             },
+            {
+                path: 'tabMain/post/edit',
+                component: () => import('@/views/pages/post/edit.vue')
+            },
             {
                 path: 'tabMain/post/recommendJob',
                 component: () => import('@/views/pages/post/recommendJob.vue')

+ 200 - 259
h5app/src/views/pages/post/edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <ion-page  class="list-page">
+  <ion-page class="list-page">
     <ion-header class="header-theme2">
       <ion-toolbar>
         <ion-buttons slot="start">
@@ -12,139 +12,168 @@
     </ion-header>
     <ion-content>
       <form autocomplete="off">
-        <ion-list>
-          <ion-item>
-            <div class="panel-title2">
-              <div class="item-flag"></div>
-              基础信息
-            </div>
-          </ion-item>
-          <ion-label class="title-item">岗位名称<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.postName.$error?'ion-invalid':'ion-valid']">
-            <ion-input placeholder="请输入岗位名称" label-placement="stacked" :clear-input="true"
-                       v-model="dataModel.postName" class="custom">
-            </ion-input>
-            <ion-note slot="error">请输入岗位名称</ion-note>
-          </ion-item>
-          <ion-label class="title-item">招聘数量(人)<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.recruitCount.$error?'ion-invalid':'ion-valid']">
-            <ion-input type="number" placeholder="请输入招聘数量" label-placement="stacked" :clear-input="true"
-                       v-model="dataModel.recruitCount" class="custom">
-            </ion-input>
-            <ion-note slot="error">请输入招聘数量</ion-note>
-          </ion-item>
-          <ion-label class="title-item">招聘日期<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.startTime.$error||v$.dataModel.endTime.$error?'ion-invalid':'ion-valid']">
-            <ion-datetime-button datetime="startTime"></ion-datetime-button>
-            <ion-modal :keep-contents-mounted="true">
-              <ion-datetime placeholder="招聘日期" id="startTime"
-                            v-model="dataModel.startTime"  :prefer-wheel="true"
-                            dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
-                            :show-default-buttons="true" style="text-align: left;width: 100%;">
-              </ion-datetime>
-            </ion-modal>
-            至
-            <ion-datetime-button datetime="endTime"></ion-datetime-button>
-            <ion-modal :keep-contents-mounted="true">
-              <ion-datetime placeholder="招聘日期" id="endTime"
-                            v-model="dataModel.endTime"  :prefer-wheel="true"
-                            dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
-                            :show-default-buttons="true" style="text-align: left;width: 100%;">
-              </ion-datetime>
-            </ion-modal>
-            <ion-note slot="error">招聘开始日期与结束日期不能为空</ion-note>
-          </ion-item>
-          <ion-label class="title-item">招聘地点<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.jobPlace.$error?'ion-invalid':'ion-valid']">
-            <ion-textarea placeholder="请输入招聘地点" :rows="3" label-placement="stacked" :clear-input="true"
-                       v-model="dataModel.jobPlace" class="custom">
-            </ion-textarea>
-            <ion-note slot="error">请输入招聘地点</ion-note>
-          </ion-item>
-
-          <ion-item mode="md" >
-            <div class="panel-title2" style="width: 25%;">
-              <div class="item-flag"></div>
-              其他信息
-            </div>
-            <div style="width: 75%;text-align: right;">
-              <ion-icon :icon="chevronDownOutline" @click="isShow=!isShow" v-show="!isShow"
-                        style="font-size: 24px;"></ion-icon>
-              <ion-icon :icon="chevronUpOutline" @click="isShow=!isShow" v-show="isShow"
-                        style="font-size: 24px;"></ion-icon>
-            </div>
-          </ion-item>
-          <ion-list v-show="isShow" >
-            <ion-label class="title-item">岗位月薪(元)</ion-label>
-            <ion-item mode="md" >
-              <ion-input placeholder="请输入金额" label-placement="stacked"
-                         v-model="dataModel.minSalary" class="custom">
-              </ion-input>
-              <ion-label style="text-align:left;width:70px;">至</ion-label>
-              <ion-input placeholder="请输入金额" label-placement="stacked"
-                         v-model="dataModel.maxSalary" class="custom">
-              </ion-input>
-            </ion-item>
-            <ion-label class="title-item">是否有试用期</ion-label>
-            <ion-item mode="md" >
-              <ion-select interface="action-sheet" placeholder="请选择是否有试用期" cancel-text="取消"
-                          id="isTrail" v-model="dataModel.isTrail" style="width: 100%;text-align: left;">
-                <ion-select-option v-for="(record,key) in isTrailList" :key="key"
-                                   v-model:value="record.value">
-                  {{ record.name }}
+        <div class="bw-vue-form">
+          <div class="form-title">基础信息</div>
+          <div class="form-select">
+            <ion-label>企业</ion-label>
+            <ion-item>
+              <ion-select interface="action-sheet" placeholder="请选择企业" cancel-text="取消"
+                          id="companyID" v-model="dataModel.companyID" style="width: 100%;text-align: left;">
+                <ion-select-option v-for="(record,key) in companyList" :key="key"
+                                   v-model:value="record.companyID">
+                  {{ record.companyName }}
                 </ion-select-option>
               </ion-select>
             </ion-item>
-            <ion-label class="title-item">试用期(月)</ion-label>
-            <ion-item mode="md" >
-              <ion-input type="number" placeholder="请输入试用期月数" label-placement="stacked"
-                         v-model="dataModel.trailMonths" class="custom">
+          </div>
+          <div class="form-input">
+            <ion-label>岗位名称<span class="danger">*</span></ion-label>
+            <ion-item :class="[v$.dataModel.postName.$error?'ion-invalid':'ion-valid']">
+              <ion-input placeholder="请输入岗位名称" label-placement="stacked" :clear-input="true"
+                         v-model="dataModel.postName" class="custom">
               </ion-input>
+              <ion-note slot="error">请输入岗位名称</ion-note>
             </ion-item>
-            <ion-label class="title-item">试用期月薪(元)</ion-label>
-            <ion-item mode="md" >
-              <ion-input type="number" placeholder="请输入金额" label-placement="stacked"
-                         v-model="dataModel.trailMinSalary" class="custom">
-              </ion-input>
-              <ion-label style="text-align:left;width:70px;">至</ion-label>
-              <ion-input type="number" placeholder="请输入金额" label-placement="stacked"
-                         v-model="dataModel.trailMaxSalary" class="custom">
+          </div>
+          <div class="form-input">
+            <ion-label>招聘人数<span class="danger">*</span></ion-label>
+            <ion-item :class="[v$.dataModel.recruitCount.$error?'ion-invalid':'ion-valid']">
+              <ion-input type="number" placeholder="请输入招聘数量" label-placement="stacked" :clear-input="true"
+                         v-model="dataModel.recruitCount" class="custom">
               </ion-input>
+              <ion-note slot="error">请输入招聘人数</ion-note>
             </ion-item>
-            <ion-label class="title-item">工作年限要求</ion-label>
-            <ion-item mode="md" >
-              <ion-select interface="action-sheet" placeholder="请选择工作年限" cancel-text="取消"
-                          id="workYear" v-model="dataModel.workYear" style="width: 100%;text-align: left;">
-                <ion-select-option v-for="(record,key) in workYearList" :key="key"
-                                   v-model:value="record.value">
-                  {{ record.name }}
-                </ion-select-option>
-              </ion-select>
-            </ion-item>
-            <ion-label class="title-item">学历要求</ion-label>
-            <ion-item mode="md" >
-              <ion-select interface="action-sheet" placeholder="请选择学历" cancel-text="取消"
-                          id="cultureRank" v-model="dataModel.cultureRank" style="width: 100%;text-align: left;">
-                <ion-select-option v-for="(record,key) in cultureRankList" :key="key"
-                                   v-model:value="record.value">
-                  {{ record.name }}
-                </ion-select-option>
-              </ion-select>
+          </div>
+          <div class="form-input">
+            <ion-label>招聘日期<span class="danger">*</span></ion-label>
+            <ion-item
+                      :class="[v$.dataModel.startTime.$error||v$.dataModel.endTime.$error?'ion-invalid':'ion-valid']">
+              <ion-datetime-button datetime="startTime"></ion-datetime-button>
+              <ion-modal :keep-contents-mounted="true">
+                <ion-datetime placeholder="招聘日期" id="startTime"
+                              v-model="dataModel.startTime" :prefer-wheel="true"
+                              dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
+                              :show-default-buttons="true" style="text-align: left;width: 100%;">
+                </ion-datetime>
+              </ion-modal>
+              至
+              <ion-datetime-button datetime="endTime"></ion-datetime-button>
+              <ion-modal :keep-contents-mounted="true">
+                <ion-datetime placeholder="招聘日期" id="endTime"
+                              v-model="dataModel.endTime" :prefer-wheel="true"
+                              dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
+                              :show-default-buttons="true" style="text-align: left;width: 100%;">
+                </ion-datetime>
+              </ion-modal>
+              <ion-note slot="error">招聘开始日期与结束日期不能为空</ion-note>
             </ion-item>
-            <ion-label class="title-item">福利待遇</ion-label>
-            <ion-item mode="md" >
-              <ion-textarea placeholder="请输入福利待遇" :rows="3" label-placement="stacked"
-                            v-model="dataModel.welfare" class="custom">
+          </div>
+          <div class="form-input">
+            <ion-label>招聘地点<span class="danger">*</span></ion-label>
+            <ion-item :class="[v$.dataModel.jobPlace.$error?'ion-invalid':'ion-valid']">
+              <ion-textarea placeholder="请输入招聘地点" :rows="3" label-placement="stacked" :clear-input="true"
+                            v-model="dataModel.jobPlace" class="custom">
               </ion-textarea>
+              <ion-note slot="error">请输入招聘地点</ion-note>
             </ion-item>
-            <ion-label class="title-item">其他要求</ion-label>
-            <ion-item mode="md" >
-              <ion-textarea placeholder="请输入其他要求" :rows="3" label-placement="stacked"
-                            v-model="dataModel.postDesc" class="custom">
-              </ion-textarea>
-            </ion-item>
-          </ion-list>
-        </ion-list>
+          </div>
+        </div>
+        <div class="bw-vue-form">
+          <div class="form-title" style="display: flex;justify-content: space-between;">
+            <div style="width: 25%;">
+              其他信息
+            </div>
+            <div style="width: 75%;text-align: right;">
+              <ion-label style="color: red;font-size: 14px;" @click="isShow=!isShow">{{isShow?"收起":"展开"}}</ion-label>
+            </div>
+          </div>
+          <div v-show="isShow">
+            <div class="form-input">
+              <ion-label>岗位月薪(元)</ion-label>
+              <ion-item>
+                <ion-input placeholder="请输入金额" label-placement="stacked"
+                           v-model="dataModel.minSalary" class="custom">
+                </ion-input>
+                <ion-label style="text-align:left;width:70px;">至</ion-label>
+                <ion-input placeholder="请输入金额" label-placement="stacked"
+                           v-model="dataModel.maxSalary" class="custom">
+                </ion-input>
+              </ion-item>
+            </div>
+            <div class="form-select">
+              <ion-label>是否有试用期</ion-label>
+              <ion-item>
+                <ion-select interface="action-sheet" placeholder="请选择是否有试用期" cancel-text="取消"
+                            id="isTrail" v-model="dataModel.isTrail" style="width: 100%;text-align: left;">
+                  <ion-select-option v-for="(record,key) in isTrailList" :key="key"
+                                     v-model:value="record.value">
+                    {{ record.name }}
+                  </ion-select-option>
+                </ion-select>
+              </ion-item>
+            </div>
+            <div class="form-input">
+              <ion-label>试用期(月)</ion-label>
+              <ion-item>
+                <ion-input type="number" placeholder="请输入试用期月数" label-placement="stacked"
+                           v-model="dataModel.trailMonths" class="custom">
+                </ion-input>
+              </ion-item>
+            </div>
+            <div class="form-input">
+              <ion-label>试用期月薪(元)</ion-label>
+              <ion-item>
+                <ion-input type="number" placeholder="请输入金额" label-placement="stacked"
+                           v-model="dataModel.trailMinSalary" class="custom">
+                </ion-input>
+                <ion-label style="text-align:left;width:70px;">至</ion-label>
+                <ion-input type="number" placeholder="请输入金额" label-placement="stacked"
+                           v-model="dataModel.trailMaxSalary" class="custom">
+                </ion-input>
+              </ion-item>
+            </div>
+            <div class="form-input">
+              <ion-label>工作年限要求</ion-label>
+              <ion-item>
+                <ion-select interface="action-sheet" placeholder="请选择工作年限" cancel-text="取消"
+                            id="workYear" v-model="dataModel.workYear" style="width: 100%;text-align: left;">
+                  <ion-select-option v-for="(record,key) in workYearList" :key="key"
+                                     v-model:value="record.value">
+                    {{ record.name }}
+                  </ion-select-option>
+                </ion-select>
+              </ion-item>
+            </div>
+            <div class="form-select">
+              <ion-label>学历要求</ion-label>
+              <ion-item>
+                <ion-select interface="action-sheet" placeholder="请选择学历" cancel-text="取消"
+                            id="cultureRank" v-model="dataModel.cultureRank" style="width: 100%;text-align: left;">
+                  <ion-select-option v-for="(record,key) in cultureRankList" :key="key"
+                                     v-model:value="record.value">
+                    {{ record.name }}
+                  </ion-select-option>
+                </ion-select>
+              </ion-item>
+            </div>
+            <div class="form-input">
+              <ion-label>福利待遇</ion-label>
+              <ion-item>
+                <ion-textarea placeholder="请输入福利待遇" :rows="3" label-placement="stacked"
+                              v-model="dataModel.welfare" class="custom">
+                </ion-textarea>
+              </ion-item>
+            </div>
+            <div class="form-input">
+              <ion-label>其他要求</ion-label>
+              <ion-item>
+                <ion-textarea placeholder="请输入其他要求" :rows="3" label-placement="stacked"
+                              v-model="dataModel.postDesc" class="custom">
+                </ion-textarea>
+              </ion-item>
+            </div>
+          </div>
+        </div>
       </form>
     </ion-content>
     <ion-footer>
@@ -162,9 +191,11 @@ import {chevronDownOutline, chevronUpOutline, arrowBackOutline} from 'ionicons/i
 import {useRoute, useRouter} from "vue-router";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {useVuelidate} from "@vuelidate/core";
-import {getPostByID,savePost} from "@/api/post";
+import {getPostByID, savePost} from "@/api/post";
 import {minLength, required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
+import {getCompanyBySiteID} from "@/api/company";
+import {useUserStore} from '@/store/modules/user';
 import dayjs from "dayjs";
 
 export default defineComponent({
@@ -172,28 +203,30 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const route = useRoute();
+    const userStore = useUserStore();
     const isShow = ref<any>(false);
     const isEdit = ref<any>(false);
     const formState = reactive({
       dataModel: {
-        companyID:null,
-        postID:null,
-        postName:null,
-        recruitCount:null,
-        startTime:dayjs().format("YYYY-MM-DD"),
-        endTime:dayjs().format("YYYY-MM-DD"),
-        jobPlace:null,
-        minSalary:null,
-        maxSalary:null,
-        isTrail:null,
-        trailMonths:null,
-        trailMinSalary:null,
-        trailMaxSalary:null,
-        workYear:null,
-        cultureRank:null,
-        welfare:null,
-        postDesc:null
-      }});
+        companyID: null,
+        postID: null,
+        postName: null,
+        recruitCount: null,
+        startTime: dayjs().format("YYYY-MM-DD"),
+        endTime: dayjs().format("YYYY-MM-DD"),
+        jobPlace: null,
+        minSalary: null,
+        maxSalary: null,
+        isTrail: null,
+        trailMonths: null,
+        trailMinSalary: null,
+        trailMaxSalary: null,
+        workYear: null,
+        cultureRank: null,
+        welfare: null,
+        postDesc: null
+      }
+    });
     const rules = computed(() => {
       return {
         dataModel: {
@@ -201,7 +234,7 @@ export default defineComponent({
           recruitCount: {required},
           startTime: {required},
           endTime: {required},
-          jobPlace:{required}
+          jobPlace: {required}
         }
       }
     });
@@ -212,6 +245,7 @@ export default defineComponent({
     ]);
     const workYearList = ref([]);
     const cultureRankList = ref([]);
+    const companyList = ref([]);
 
     const presentAlert = async (message: string) => {
       const alert = await alertController.create({
@@ -224,52 +258,58 @@ export default defineComponent({
       await alert.present();
     }
 
-    const onSave = async function (){
+    const onSave = async function () {
       const isFormCorrect = await v$.value.$validate();
       if (!isFormCorrect) {
-        console.log("当前岗位信息",formState.dataModel);
+        console.log("当前岗位信息", formState.dataModel);
         await presentAlert('请输入完整信息!');
         return null;
       }
-      savePost(formState.dataModel).then(result=>{
-        if(result){
-           router.push({path: "./postList", query: {reload:1,id:formState.dataModel.companyID,status: 3}});
+      savePost(formState.dataModel).then(result => {
+        if (result) {
+          router.push({path: "./list", query: {reload: 1}});
         }
       })
     }
 
     const back = () => {
-      router.push({path: "./postList", query: {reload:1,id:formState.dataModel.companyID,status: 3}});
+      router.push({path: "./list", query: {reload: 1}});
     }
 
-    const getWorkYearList = async function(){
-      const data :any = await getSysDictionaryList("WorkYearType");
+    const getCompanyBySiteIDList = async function () {
+      let siteID = userStore.getUserInfo.siteID;
+      const data: any = await getCompanyBySiteID(siteID);
+      companyList.value = data;
+    }
+    const getWorkYearList = async function () {
+      const data: any = await getSysDictionaryList("WorkYearType");
       workYearList.value = data;
       console.log(workYearList.value);
     }
-    const getCultureRankList = async function(){
-      const data:any = await getSysDictionaryList("CultureLevel");
+    const getCultureRankList = async function () {
+      const data: any = await getSysDictionaryList("CultureLevel");
       cultureRankList.value = data;
       console.log(cultureRankList.value);
     }
 
-    const loadData = async (postID: any,companyID:any) => {
+    const loadData = async (postID: any, companyID: any) => {
+      await getCompanyBySiteIDList();
       await getWorkYearList();
       await getCultureRankList();
       const reqData = await getPostByID(postID);
       formState.dataModel = reqData;
       formState.dataModel.companyID = companyID;
-      console.log("初始化岗位信息",formState.dataModel);
+      console.log("初始化岗位信息", formState.dataModel);
     };
 
-    const reload = (postID: any,companyID:any) => {
+    const reload = (postID: any, companyID: any) => {
       formState.dataModel.recruitCount = null;
-      loadData(postID,companyID);
+      loadData(postID, companyID);
     }
 
     onIonViewDidEnter(() => {
       if (route.query.reload)
-        reload(route.query.id,route.query.companyID);
+        reload(route.query.id, route.query.companyID);
     });
 
     return {
@@ -281,6 +321,7 @@ export default defineComponent({
       router,
       isShow,
       isEdit,
+      companyList,
       isTrailList,
       workYearList,
       cultureRankList,
@@ -294,105 +335,5 @@ export default defineComponent({
 
 <style lang="less">
 
-.custom{
-  --placeholder-color: gray;
-  --placeholder-font-style:italic;
-  --placeholder-opacity: 1;
-}
-
-.title-item{
-  margin-left: 15px;
-  color:#1c3d70 !important;
-  font-size: 14px !important;
-  font-weight: bold;
-}
-
-ion-item {
-  --border-width: 0;
-  --border-style: none;
-
-  ion-label, input, ion-select, ion-datetime {
-    font-size: 14px !important;
-  }
-}
-
-.stepFlex {
-  margin: 0;
-  display: flex;
-  width: 100%;
-
-  .stepFlex-item {
-    position: relative;
-    flex: 1;
-    text-align: center;
-    margin-top: -10px;
-
-    .stepFlex-item-label {
-      padding-top: 60px;
-      font-size: 14px;
-
-      .stepFlex-item-label-title {
-        margin-top: 30px;
-      }
-
-      .stepFlex-item-label-desc {
-        margin-top: 5px;
-        color: #b9b9bd;
-      }
-    }
-  }
-
-  .greenCircle {
-    top: calc(50% - 15px);
-    left: calc(50% - 4px);
-    position: absolute;
-    z-index: 2;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    background-color: #31A2FE;
-  }
-
-  .now {
-    top: calc(50% - 18px);
-    left: calc(50% - 8px);
-    position: absolute;
-    z-index: 3;
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background-color: #31A2FE;
-    border: 4px solid #c5e8f9;
-  }
-
-  .grayCircle {
-    top: calc(50% - 15px);
-    left: calc(50% - 4px);
-    position: absolute;
-    z-index: 2;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    background-color: #ccc;
-  }
-
-  .greenLine {
-    width: 100%;
-    top: calc(50% - 11px);
-    left: calc(50% - 2px);
-    height: 2px;
-    background-color: #31A2FE;
-    position: absolute;
-  }
-
-  .grayLine {
-    height: 0;
-    border: 1px dashed #ccc;
-    width: 100%;
-    top: calc(50% - 11px);
-    left: calc(50% - 2px);
-    position: absolute;
-  }
 
-}
 </style>

+ 7 - 0
src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseErrorEnum;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
+import com.hz.employmentsite.model.PcCompany;
 import com.hz.employmentsite.model.PcSite;
 import com.hz.employmentsite.util.DateUtils;
 import com.hz.employmentsite.util.ExcelHelper;
@@ -46,6 +47,12 @@ public class CompanyController {
         return RespGenerstor.success(result);
     }
 
+    @ResponseBody
+    @GetMapping("/getCompanyBySiteIDList")
+    public BaseResponse<List<PcCompany>> getCompanyBySiteIDList(@RequestParam(required = false) String siteID) {
+        return RespGenerstor.success(companyService.getCompanyBySiteIDList(siteID));
+    }
+
     @GetMapping("/getCompanyByID")
     public BaseResponse<CompanyVo> getCompanyById(String id) {
         var data = companyService.getDataById(id);

+ 7 - 0
src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -58,6 +58,13 @@ public class CompanyServiceImpl implements CompanyService {
         return result;
     }
 
+    @Override
+    public List<PcCompany> getCompanyBySiteIDList(String siteID) {
+        PcCompanyExample exp = new PcCompanyExample();
+        exp.or().andSiteIDEqualTo(siteID);
+        return pcCompanyMapper.selectByExample(exp);
+    }
+
     @Override
     public Integer save(CompanyVo data, String userId) {
         Integer result = 0;

+ 3 - 0
src/main/java/com/hz/employmentsite/services/service/companyService/CompanyService.java

@@ -1,6 +1,7 @@
 package com.hz.employmentsite.services.service.companyService;
 
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.model.PcCompany;
 import com.hz.employmentsite.model.PcSite;
 import com.hz.employmentsite.vo.companyService.AppCompanyPostVo;
 import com.hz.employmentsite.vo.companyService.CompanyVo;
@@ -11,6 +12,8 @@ public interface CompanyService {
 
     PageInfo<CompanyVo> getList(Integer pageIndex, Integer pageSize, List<String> companyIDList, String companyName, String companyCode, String recordStatus, String regionCode, String streetCode);
 
+    List<PcCompany> getCompanyBySiteIDList(String siteID);
+
     Integer save(CompanyVo data, String userId);
 
     Integer delete(String id);

+ 1 - 0
src/main/java/com/hz/employmentsite/vo/user/UserInfoModel.java

@@ -15,6 +15,7 @@ public class UserInfoModel {
     public String userTypeName;
     public Integer recordStatus;
 
+    public String siteID;
     public String siteUserName;
     public Integer gender;
     public String genderName;

+ 1 - 1
src/main/resources/mapping/cquery/SysUserCQuery.xml

@@ -83,7 +83,7 @@
     </select>
 
     <select id="selectUserInfo" resultType="com.hz.employmentsite.vo.user.UserInfoModel">
-        select theUser.*,dic_userType.Name as UserTypeName,siteUser.SiteUserName,siteUser.Mobile as UserMobile,
+        select theUser.*,dic_userType.Name as UserTypeName,siteUser.SiteID,siteUser.SiteUserName,siteUser.Mobile as UserMobile,
                siteUser.Gender,dic_genderType.Name as GenderName from sys_user theUser
         left join pc_site_user siteUser on theUser.UserID = siteUser.UserID
         left join (select * from sys_dictionary_item where DictionaryCode ='UserType') dic_userType