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

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

@@ -37,7 +37,7 @@
       <div class="bw-vue-list">
         <div class="list-content">
           <ion-list>
-            <ion-item v-for="(record,key) in dataList" :key="key">
+            <ion-item v-for="(record,key) in dataList" :key="key" :role="key">
               <ion-label>
                 <h2>{{ record.professionName }}</h2>
                 <p>单位：{{ record.companyName }}</p>
@@ -59,7 +59,7 @@
         </div>
       </div>
       <b-empty v-if="dataList.length<=0" :loading="loading"/>
-      <ion-infinite-scroll threshold="100px" @ionInfinite="onScroll($event)">
+      <ion-infinite-scroll threshold="50px" @ionInfinite="onScroll($event)">
         <ion-infinite-scroll-content
             :loadingText="pagination.total>pagination.pageIndex*pagination.pageSize?'正在加载...':'暂无更多'"
             loadingSpinner="bubbles">
@@ -83,7 +83,7 @@ import BEmpty from "@/components/empty.vue";
 
 export default defineComponent({
   name: 'RecommendJobList',
-  components: {IonIcon,BEmpty},
+  components: {IonIcon, BEmpty},
   setup() {
     const loading = ref(true);
     const router = useRouter();
@@ -166,16 +166,6 @@ export default defineComponent({
       recommendWhereList.value[0].check = true;
     }
 
-    const onScroll = (e: any) => {
-      setTimeout(() => {
-        e.target.complete();
-        if (pagination.value.total.value > pagination.value.pageIndex * pagination.value.pageSize) {
-          searchParams.pageIndex += 1;
-          loadData();
-        }
-      }, 500);
-    }
-
     const onRecommend = (item: any) => {
       addRecommendList.value.push({
         recommendMgtID: item.recommendMgtID,
@@ -233,6 +223,16 @@ export default defineComponent({
       loadData();
     }
 
+    const onScroll = (e: any) => {
+      setTimeout(() => {
+        if (pagination.value.total.value > pagination.value.pageIndex * pagination.value.pageSize) {
+          searchParams.pageIndex += 1;
+          loadData();
+        }
+        e.target.complete();
+      }, 500);
+    }
+
     const reloadSearchParams = () => {
       searchParams.jobHuntID = route.query.jobHuntID as any;
       searchParams.jobUserName = route.query.jobUserName as any;

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="100px" @ionInfinite="onScroll($event)">
+      <ion-infinite-scroll threshold="50px" @ionInfinite="onScroll($event)">
         <ion-infinite-scroll-content
             :loadingText="pagination.total>pagination.pageIndex*pagination.pageSize?'正在加载...':'暂无更多'"
             loadingSpinner="bubbles">
@@ -160,11 +160,11 @@ export default defineComponent({
 
     const onScroll = (e: any) => {
       setTimeout(() => {
-        e.target.complete();
         if (pagination.value.total.value > pagination.value.pageIndex * pagination.value.pageSize) {
           searchParams.pageIndex += 1;
           loadData();
         }
+        e.target.complete();
       }, 500);
     }
 

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -133,7 +133,7 @@ public class CompanyController {
         } else {
             ExcelHelper excelHelper = new ExcelHelper();
             ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-            data.setTitles(Arrays.asList(new String[]{"序号", "企业名称", "所属县区", "所属街道", "统一信用代码", "企业状态", "参保人数", "企业规模", "当前岗位数量", "录入人", "录入时间"}));
+            data.setTitles(Arrays.asList(new String[]{"序号", "企业名称", "所属县区", "所属街道", "所属驿站", "统一信用代码", "企业状态", "参保人数", "企业规模", "当前岗位数量", "录入人", "录入时间"}));
             int i = 0;
             List<List<Object>> rowDatas = new ArrayList();
             for (CompanyVo item : result.getList()) {
@@ -144,6 +144,7 @@ public class CompanyController {
                 row.add(item.companyName);
                 row.add(item.regionName);
                 row.add(item.streetName);
+                row.add(item.SiteName);
                 row.add(item.companyCode);
                 row.add(recordName);
                 row.add(item.insuredCount);

src/main/java/com/hz/employmentsite/controller/companyService/PostController.java

@@ -144,7 +144,7 @@ public class PostController {
         } else {
             ExcelHelper excelHelper = new ExcelHelper();
             ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-            data.setTitles(Arrays.asList(new String[]{"序号", "岗位名称", "招聘人数","开始日期", "结束日期", "招聘企业", "岗位状态", "工种名称", "文化程度", "薪酬", "联系人", "联系电话"}));
+            data.setTitles(Arrays.asList(new String[]{"序号", "岗位名称", "招聘人数", "开始日期", "结束日期", "招聘企业", "所属驿站", "岗位状态", "工种名称", "文化程度", "薪酬", "联系人", "联系电话"}));
             int i = 0;
             List<List<Object>> rowsData = new ArrayList();
             for (PostVo item : result.getList()) {
@@ -156,6 +156,7 @@ public class PostController {
                 row.add(dateUtils.dateToStr(item.startTime));
                 row.add(dateUtils.dateToStr(item.endTime));
                 row.add(item.companyName);
+                row.add(item.getSiteName());
                 row.add(item.recordStatus == 1 ? "启用" : "停用");
                 row.add(item.workName);
                 row.add(item.cultureLevelName);

vue/src/views/companyService/company/index.vue

@@ -201,6 +201,7 @@ export default defineComponent({
       {title: '企业名称', dataIndex: 'companyName', key: 'companyName',width: 200, align: "center"},
       {title: '所属县区', dataIndex: 'regionName', key: 'regionName', width: 120, align: "center"},
       {title: '所属街道', dataIndex: 'streetName', key: 'streetName', width: 120,align: "center"},
+      {title: '所属驿站', dataIndex: 'siteName', key: 'siteName', width: 200, align: "center"},
       {title: '统一信用代码', dataIndex: 'companyCode', key: 'companyCode', width: 200,align: "center"},
       {
         title: '企业状态', dataIndex: 'recordStatus', key: 'recordStatus',width: 120, align: "center", customRender: (item) => {

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

@@ -197,7 +197,8 @@ export default defineComponent({
           return item.record.endTime == null ? "" : (dayjs(item.record.endTime).format('YYYY-MM-DD'))
         }
       },
-      {title: '招聘企业', dataIndex: 'companyName', key: 'companyName', align: "center"},
+      {title: '招聘企业', dataIndex: 'companyName', key: 'companyName', width: 200, align: "center"},
+      {title: '所属驿站', dataIndex: 'siteName', key: 'siteName', width: 200, align: "center"},
       {
         title: '岗位状态', dataIndex: 'recordStatus', key: 'recordStatus', align: "center", customRender: (item) => {
           return item.record.recordStatus == 1 ? "启用" : "停用";