app-企业信息收集功能调整

h5app/src/api/company/index.ts

@@ -64,7 +64,7 @@ export function getCompanyPostList(params:any){
     return request({
         url:'companyService/post/getList',
         method:'get',
-        params
+        params: params,
     },{
         isNew:true
     })
@@ -80,6 +80,16 @@ export function getCompanyById(id: string) {
     })
 }
 
+export function saveCompanyInfo(data: any) {
+    return request<object>({
+        url: 'companyService/company/save',
+        method: 'post',
+        data: data
+    }, {
+        isNew: true,
+    })
+}
+
 export function getCurrentDate() {
     const now = new Date();
     const year = now.getFullYear();

h5app/src/api/post/index.ts

@@ -11,6 +11,28 @@ export function getPostList() {
     );
 }
 
+export function getPostByID(id:any) {
+    return request(
+        {
+            url: 'companyService/post/getPostByID',
+            method: 'get',
+            params: {id:id},
+        },
+        { isNew: true },
+    );
+}
+
+export function savePost(data:any) {
+    return request(
+        {
+            url: 'companyService/post/save',
+            method: 'post',
+            data: data,
+        },
+        { isNew: true },
+    );
+}
+
 export function getCommendPostList(params:any) {
     return request<object>(
         {

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

@@ -3,7 +3,7 @@
     <ion-header class="header-theme2">
       <ion-toolbar>
         <ion-buttons slot="start">
-          <ion-icon :icon="arrowBackOutline" @click="back"></ion-icon>
+          <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
         </ion-buttons>
         <ion-title>
           企业信息录入
@@ -14,7 +14,7 @@
       <div class="stepFlex">
         <div v-for="(record,key) in stepList" :key="key" class="stepFlex-item">
           <div
-              :class="[(record.val < curStepData?.statusVal || curStepData?.statusVal == stepList[stepList.length-1].val) ? 'greenCircle' :record.val == curStepData?.statusVal ? 'now' : 'grayCircle']"></div>
+              :class="[(record.val < curStepData?.statusVal || curStepData?.statusVal == stepList.val) ? 'greenCircle' :record.val == curStepData?.statusVal ? 'now' : 'grayCircle']"></div>
           <div v-if="key !== stepList.length - 1"
                :class="[record.val < curStepData?.statusVal ? 'greenLine' : 'grayLine']"></div>
           <div class="stepFlex-item-label">
@@ -56,9 +56,9 @@
             <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.address.$error?'ion-invalid':'ion-valid']">
+          <ion-item mode="md" :class="[v$.dataModel.companyAddress.$error?'ion-invalid':'ion-valid']">
             <ion-textarea placeholder="请输入企业办公地址" label-placement="stacked" :rows="3" :clear-input="true"
-                       v-model="dataModel.address" class="custom" >
+                       v-model="dataModel.companyAddress" class="custom" >
             </ion-textarea>
             <ion-note slot="error">企业办公地址不能为空</ion-note>
           </ion-item>
@@ -88,8 +88,8 @@
             <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.isShortAge.$error?'ion-invalid':'ion-valid']">
-            <ion-select id="isShortAge" name="isShortAge" cancel-text="取消"  v-model="dataModel.isShortAge"
+          <ion-item mode="md" :class="[v$.dataModel.isShortage.$error?'ion-invalid':'ion-valid']">
+            <ion-select id="isShortAge" name="isShortAge" cancel-text="取消"  v-model="dataModel.isShortage"
                         interface="action-sheet" placeholder="请选择是否缺工" style="width: 100%;text-align: left;">
               <ion-select-option v-for="(record,key) in shortAgeTypeList" :key="key"
                                  v-model:value="record.value">
@@ -99,9 +99,6 @@
             <ion-note slot="error">企业状态不能为空</ion-note>
           </ion-item>
 
-
-
-
           <ion-item mode="md" >
             <div class="panel-title2" style="width: 25%;">
               <div class="item-flag"></div>
@@ -123,14 +120,18 @@
             </ion-item>
             <ion-label class="title-item">营业执照有效期</ion-label>
             <ion-item mode="md">
-              <ion-datetime-button datetime="validTime"></ion-datetime-button>
-              <ion-modal :keep-contents-mounted="true">
-                <ion-datetime id="validTime" placeholder="营业执照有效期"
-                              v-model="dataModel.validTime"  :prefer-wheel="true"
-                              dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
-                              :show-default-buttons="true" >
-                </ion-datetime>
-              </ion-modal>
+              <div>
+                <ion-radio v-model:checked="isLongDate" justify="start" labelPlacement="end"
+                           @click="changeLongDate" style="height:30px;">至长期</ion-radio>
+                <ion-datetime-button datetime="validDate" style=""></ion-datetime-button>
+                <ion-modal :keep-contents-mounted="true" >
+                  <ion-datetime id="validDate" name="validDate" placeholder="营业执照有效期"
+                                v-model="dataModel.validDate"  :prefer-wheel="true"  @ionChange="changeValidDate"
+                                dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
+                                :show-default-buttons="true" >
+                  </ion-datetime>
+                </ion-modal>
+              </div>
             </ion-item>
             <ion-label class="title-item">企业邮箱</ion-label>
             <ion-item mode="md">
@@ -153,7 +154,7 @@
               <ion-select interface="action-sheet" placeholder="请选择企业规模" cancel-text="取消"
                           id="companyModel" v-model="dataModel.companyModel"  style="width: 100%;text-align: left;">
                 <ion-select-option v-for="(record,key) in companyModelList" :key="key"
-                                   v-model:value="record.code" style="width:100%;text-align: left;">
+                                   v-model:value="record.value" style="width:100%;text-align: left;">
                   {{ record.name }}
                 </ion-select-option>
               </ion-select>
@@ -181,7 +182,7 @@
             <ion-label class="title-item">用工情况(人)</ion-label>
             <ion-item mode="md">
               <ion-input type="number" placeholder="请输入用工人数" label-placement="stacked" :clear-input="true"
-                         v-model="dataModel.insuredCount" class="custom">
+                         v-model="dataModel.workSituation" class="custom">
               </ion-input>
             </ion-item>
             <ion-label class="title-item">参保人数(人)</ion-label>
@@ -209,7 +210,7 @@
     <ion-footer>
       <ion-toolbar>
         <div slot="end">
-          <ion-button shape="round" expand="block" @click="next">下一步</ion-button>
+          <ion-button shape="round" expand="block" @click="onNext">下一步</ion-button>
         </div>
       </ion-toolbar>
     </ion-footer>
@@ -217,20 +218,24 @@
 </template>
 <script lang="ts">
 import {defineComponent, ref, reactive, computed, watch, toRefs} from "vue";
-import {getRegionList, getSiteList, getStreeList,getCurrentDate} from '@/api/company/index'
+import {chevronDownOutline, chevronUpOutline, arrowBackOutline} from 'ionicons/icons';
+import {getRegionList, getSiteList, getStreeList} from '@/api/company/index'
 import {useRoute,useRouter} from "vue-router";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {useVuelidate} from "@vuelidate/core";
-import {getCompanyById} from "@/api/company";
-import {chevronDownOutline, chevronUpOutline, arrowBackOutline} from 'ionicons/icons';
+import {getCompanyById,saveCompanyInfo} from "@/api/company";
 import {minLength,required} from "@vuelidate/validators";
+import {getSysDictionaryList} from "@/api/system/dictionary";
+import dayjs from "dayjs";
 
 interface StepParams{
   name: string,
   statusVal: number
 }
+
+
 export default defineComponent({
-  name: 'PracticeIntentionEdit',
+  name: 'CompanyEdit',
   setup() {
     const route = useRoute();
     const router = useRouter();
@@ -238,31 +243,37 @@ export default defineComponent({
       name:"",
       statusVal: 1
     });
+    const isAdd = ref<any>(true);
     const isShow = ref<any>(false);
+    const isLongDate = ref<any>(false);
     const formState = reactive({
       dataModel: {
+        companyID:null,
         companyCode: null,
         companyName: null,
         siteID: null,
-        address: null,
-        userName:null,
-        userMobile:null,
-        recordStatus: 1,
-        isShortAge: null,
+        companyAddress: null,
+        userName: null,
+        userMobile: null,
+        recordStatus: null,
+        isShortage: null,
         frName: null,
-        validTime:new Date(),
-        companyEmail:null,
-        companyType:null,
-        companyModel:null,
-        regionCode:null,
-        streetCode:null,
-
+        validDate: dayjs().format("YYYY-MM-DD"),
+        companyEmail: null,
+        companyType: null,
+        companyModel: null,
+        regionCode: null,
+        streetCode: null,
+        workSituation: null,
+        insuredCount: null,
+        businScope: null,
+        companyDesc: null
     }});
-
     const stepList = ref([
         {title: '基础信息', desc: '企业基础信息', val: 1},
         {title: '岗位信息', desc: '企业岗位信息', val: 2}
     ]);
+
     const companyTypeList = ref<any>([]);
     const companyModelList = ref<any>([]);
     const regionList = ref<any>([]);
@@ -272,16 +283,15 @@ export default defineComponent({
       {value: 1, name: '在营'},
       {value: 0, name: '关闭'},
     ];
-    const shortAgeTypeList =[
+    const shortAgeTypeList = [
       {value: 1, name: '是'},
       {value: 0, name: '否'},
     ];
 
-    const showSelectedDate=()=>{
-      console.log('Selected Date:', formState.dataModel.validTime);
-    }
-    const doneHandler=()=>{
-      console.log('Selected Date:',formState.dataModel.validTime);
+
+    const getCompanyModelList = async function(){
+      const companyModelResult :any = await getSysDictionaryList("CompanyModel");
+      companyModelList.value = companyModelResult;
     }
 
     const rules = computed(() => {
@@ -290,32 +300,51 @@ export default defineComponent({
           companyCode: {required},
           companyName: {required},
           siteID: {required},
-          address: {required},
+          companyAddress: {required},
           userName: {required},
           userMobile: {required},
           recordStatus: {required},
-          isShortAge: {required},
+          isShortage: {required},
         }
       }
     });
     const v$ = useVuelidate(rules, formState);
 
-    const next = async () => {
+    const changeLongDate = ()=>{
+      isLongDate.value = true;
+      formState.dataModel.validDate = "2099-12-31T00:00:00.000+08:00";
+    };
+
+    const changeValidDate = () => {
+        isLongDate.value = false;
+    };
+
+    const onNext = async () => {
       const isFormCorrect = await v$.value.$validate();
       if (!isFormCorrect) {
         await presentAlert('请输入完整信息！');
         return null;
       }
-      const jsonStr = JSON.stringify(formState.dataModel);
+      /*const jsonStr = JSON.stringify(formState.dataModel);
       localStorage.removeItem('companyData');
-      localStorage.setItem("companyData", jsonStr);
-      if(route.query.pageStatus=='2')
-        await router.push({path: './postList', query: {pageStatus: 2}});
-      else
-        await router.push({path: './postList', query: {pageStatus: 1}});
-    }
-    const onCancel = () => {
-      router.push("./index");
+      localStorage.setItem("companyData", jsonStr);*/
+      saveCompanyInfo(formState.dataModel).then(result => {
+        if (result) {
+          if(isAdd.value){
+            router.push({path: './list', query: {reload:1}});
+          }
+          else{
+            router.push({path: './postList', query: {reload:1,id:formState.dataModel.companyID,status:3}});
+          }
+        }
+      });
+    };
+
+    const onBack=()=>{
+      if(isAdd.value)
+        router.push({path: './list', query: {reload:1}});
+      else if(curStepData.value.statusVal==1)
+        router.push({path: './menu', query: {reload:1,id:formState.dataModel.companyID,status:2}});
     }
 
     const getRegionListData = () => {
@@ -341,26 +370,30 @@ export default defineComponent({
 
     const loadData = async (companyID: any,status:any) => {
       curStepData.value.statusVal = status;
-      console.log("当前companyID",companyID);
+      isAdd.value = companyID == null;
       const reqData = await getCompanyById(companyID);
       formState.dataModel = reqData;
+      isLongDate.value = formState.dataModel.validDate == "2099-12-31T00:00:00.000+08:00";
       console.log('dataModel',formState.dataModel);
+      console.log('isAdd',isAdd.value);
+      if(formState.dataModel.regionCode!=null) getStreetListData(formState.dataModel.regionCode);
     };
 
-    watch(() => route.query, () => {
+   /* watch(() => route.query, () => {
       if (route.query.reload) {
-        loadData(route.query.companyID,route.query.status);
+        loadData(route.query.id,route.query.status);
       }
-    });
+    });*/
 
     const reload = (companyID:any,status:any) => {
+      isAdd.value = true;
       isShow.value = false;
       loadData(companyID,status);
     }
 
     onIonViewDidEnter(() => {
       if (route.query.reload) {
-        reload(route.query.companyID,route.query.status);
+        reload(route.query.id,route.query.status);
       }
     });
 
@@ -376,21 +409,16 @@ export default defineComponent({
       await alert.present();
     }
 
-
-    const back=()=>{
-      isShow.value=false;
-      router.push('./list');
-    }
-
     return {
       ...toRefs(formState),
       arrowBackOutline,
       chevronDownOutline,
       chevronUpOutline,
       route,
-      isShow,
       router,
+      isShow,
       v$,
+      isLongDate,
       curStepData,
       stepList,
       companyTypeList,
@@ -400,22 +428,20 @@ export default defineComponent({
       shortAgeTypeList,
       companyStatusList,
       companyModelList,
-      next,
-      back,
-      onCancel,
+      onNext,
+      onBack,
+      getCompanyModelList,
       getRegionListData,
       getSiteListData,
       changeCity,
-      showSelectedDate,
+      changeLongDate,
+      changeValidDate,
       loadData,
-      doneHandler
     }
   },mounted(){
+    this.getCompanyModelList();
     this.getRegionListData();
     this.getSiteListData();
-    const companyID = this.route.query.companyID;
-    const status = this.route.query.status;
-    this.loadData(companyID,status);
   }
 });
 </script>

h5app/src/views/pages/company/editPost.vue

@@ -1,5 +1,5 @@
 <template>
-  <ion-page>
+  <ion-page  class="list-page">
     <ion-header class="header-theme2">
       <ion-toolbar>
         <ion-buttons slot="start">
@@ -13,43 +13,138 @@
     <ion-content>
       <form autocomplete="off">
         <ion-list>
+          <ion-item>
+            <div class="panel-title2">
+              <div class="item-flag"></div>
+              基础信息
+            </div>
+            <ion-icon slot="end" :icon="addCircleOutline" @click="onAdd()" style="font-size: 24px;"></ion-icon>
+          </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-label style="width: 100px;">岗位名称<span class="danger">*</span></ion-label>
             <ion-input placeholder="请输入岗位名称" label-placement="stacked" :clear-input="true"
-                       v-model="formState.dataModel.postName">
+                       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-label style="width: 100px;">招聘数量<span class="danger">*</span></ion-label>
-            <ion-input placeholder="请输入招聘数量" label-placement="stacked" :clear-input="true"
-                       v-model="formState.dataModel.recruitCount"
-            >
+            <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-item mode="md" :class="[v$.dataModel.validDay.$error?'ion-invalid':'ion-valid']">
-            <ion-label style="width: 100px;">有效天数<span class="danger">*</span></ion-label>
-            <ion-input placeholder="请输入有效天数" label-placement="stacked" :clear-input="true"
-                       v-model="formState.dataModel.validDay">
-            </ion-input>
-            <ion-note slot="error">请输入有效天数</ion-note>
+          <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-item mode="md">
-            <div style="width: 20%">
-              <ion-label>招聘日期<span class="danger">*</span></ion-label>
+          <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: 80%;padding: 0;margin: 0;">
-              <ion-datetime-button datetime="jobVacancyTime" style="width: 70%;"></ion-datetime-button>
-              <ion-modal :keep-contents-mounted="true">
-                <ion-datetime placeholder="招聘日期" id="jobVacancyTime"
-                              v-model="jobVacancyTime"
-                              dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
-                              :show-default-buttons="true">
-                </ion-datetime>
-              </ion-modal>
+            <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 }}
+                </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.trailtime" class="custom">
+              </ion-input>
+            </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">
+              </ion-input>
+            </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.workTime" style="width: 100%;text-align: left;">
+                <ion-select-option v-for="(record,key) in workTimeList" :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>
+            </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">
+              </ion-textarea>
+            </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>
       </form>
     </ion-content>
@@ -63,148 +158,155 @@
   </ion-page>
 </template>
 <script lang="ts">
-import {computed, defineComponent, reactive, ref, watch} from "vue";
+import {computed, defineComponent, reactive, ref, toRefs, watch} from "vue";
+import {chevronDownOutline, chevronUpOutline, arrowBackOutline} from 'ionicons/icons';
 import {useRoute, useRouter} from "vue-router";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
-import {arrowBackOutline} from 'ionicons/icons';
 import {useVuelidate} from "@vuelidate/core";
-import {getCurrentDate} from "@/api/company";
+import {getPostByID,savePost} from "@/api/post";
 import {minLength, required} from "@vuelidate/validators";
-import PostList from "@/views/pages/company/postList.vue";
-
-interface FormState {
-  dataModel: {
-    postName?: string | null,
-    recruitCount?: number | null,
-    validTime?: string | null,
-    // jobVacancyTime?: string | null,
-    validDay?: number | null
-  };
-}
-
-interface PostModel {
-  postName?: string | null,
-  recruitCount?: number | null,
-  validTime?: string | null,
-  validDay?: number | null
-}
+import {getSysDictionaryList} from "@/api/system/dictionary";
+import dayjs from "dayjs";
 
 export default defineComponent({
-  name: 'editPost',
+  name: 'PostEdit',
   setup() {
-    const jobVacancyTime = ref<string>();
     const router = useRouter();
     const route = useRoute();
+    const isShow = ref<any>(false);
     const isEdit = ref<any>(false);
-    const formState = reactive<FormState>({dataModel: {}});
-    const oldDataModel= reactive<FormState>({dataModel: {}});
-    const postList = ref<PostModel[]>([]);
+    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,
+        trailtime:null,
+        trailMinSalary:null,
+        trailMaxSalary:null,
+        workTime:null,
+        cultureRank:null,
+        welfare:null,
+        postDesc:null
+      }});
     const rules = computed(() => {
       return {
         dataModel: {
-          validDay: {required},
-          recruitCount: {required},
           postName: {required},
-          // jobVacancyTime: {required},
+          recruitCount: {required},
+          startTime: {required},
+          endTime: {required},
+          jobPlace:{required}
         }
       }
     });
     const v$ = useVuelidate(rules, formState);
+    const isTrailList = ref([
+      {value: true, name: '是'},
+      {value: false, name: '否'},
+    ]);
+    const workTimeList = ref([]);
+    const cultureRankList = ref([]);
 
-    const onSave = async () => {
+    const presentAlert = async (message: string) => {
+      const alert = await alertController.create({
+        header: '错误！',
+        message: message,
+        buttons: [
+          '确定'
+        ],
+      });
+      await alert.present();
+    }
+
+    const onSave = async function (){
       const isFormCorrect = await v$.value.$validate();
       if (!isFormCorrect) {
+        console.log("当前岗位信息",formState.dataModel);
         await presentAlert('请输入完整信息！');
         return null;
       }
-      const indexToUpdate = postList.value.findIndex(post => post.postName === formState.dataModel.postName);
-      if (indexToUpdate != -1) {
-        postList.value[indexToUpdate].recruitCount = formState.dataModel.recruitCount;
-        postList.value[indexToUpdate].validTime = jobVacancyTime.value;
-        postList.value[indexToUpdate].validDay = formState.dataModel.validDay;
-      } else {
-        formState.dataModel.validTime = jobVacancyTime.value;
-        postList.value.push(formState.dataModel);
-      }
-      const jsonPostList = JSON.stringify(postList.value);
-      localStorage.removeItem("postData");
-      localStorage.setItem("postData", jsonPostList);
-      if (route.query.id) {
-        await router.push({path: "./postList", query: {pageStatus: 3, id: route.query.id,editPostStatus:1}});
-      } else {
-        await router.push({path: "./postList", query: {pageStatus: 3}});
-      }
-
+      savePost(formState.dataModel).then(result=>{
+        if(result){
+           router.push({path: "./postList", query: {reload:1,id:formState.dataModel.companyID,status: 3}});
+        }
+      })
     }
 
-    const onCancel = () => {
-      router.push({path: "./index"});
+    const back = () => {
+      router.push({path: "./postList", query: {reload:1,id:formState.dataModel.companyID,status: 3}});
     }
 
-    const loadData = (practiceTaskStudentID: any) => {
-      const jsonPostList = localStorage.getItem("postData");
-      postList.value = JSON.parse(jsonPostList ?? "");
-      console.log(postList);
-    };
+    const getWorkYearList = async function(){
+      const data :any = await getSysDictionaryList("WorkYearType");
+      workTimeList.value = data;
+      console.log(workTimeList.value);
+    }
+    const getCultureRankList = async function(){
+      const data:any = await getSysDictionaryList("CultureLevel");
+      cultureRankList.value = data;
+      console.log(cultureRankList.value);
+    }
 
-     const initData = (id: any) => {
-      if (route.query.addStatus) {
-        formState.dataModel.recruitCount = null;
-        formState.dataModel.validTime = getCurrentDate();
-        jobVacancyTime.value = getCurrentDate();
-        formState.dataModel.validDay = null;
-        formState.dataModel.postName = null;
-      }
-      if (route.query.id) {
-        isEdit.value = true;
-      }
-      loadData(id);
-      console.log(jobVacancyTime.value);
+    const loadData = async (postID: any,companyID:any) => {
+      await getWorkYearList();
+      await getCultureRankList();
+      const reqData = await getPostByID(postID);
+      formState.dataModel = reqData;
+      formState.dataModel.companyID = companyID;
+      console.log("初始化岗位信息",formState.dataModel);
     };
 
-    const back = () => {
-      if (isEdit.value) {
-        router.push({path: './postList', query: {pageStatus: 2, id: route.query.id}});
-      } else {
-        router.push({path: './postList', query: {pageStatus: 2}});
-      }
+    const reload = (postID: any,companyID:any) => {
+      formState.dataModel.recruitCount = null;
+      loadData(postID,companyID);
     }
 
     onIonViewDidEnter(() => {
-      initData(route.query.id);
+      if (route.query.reload)
+        reload(route.query.id,route.query.companyID);
     });
 
-    const presentAlert = async (message: string) => {
-      const alert = await alertController.create({
-        header: '错误！',
-        message: message,
-        buttons: [
-          '确定'
-        ],
-      });
-      await alert.present();
-    }
-
     return {
-      formState,
-      initData,
-      onSave,
-      onCancel,
-      route,
-      postList,
+      ...toRefs(formState),
+      chevronDownOutline,
+      chevronUpOutline,
       arrowBackOutline,
-      jobVacancyTime,
+      route,
       router,
+      isShow,
       isEdit,
+      isTrailList,
+      workTimeList,
+      cultureRankList,
+      v$,
+      onSave,
       back,
-      oldDataModel,
-      v$
     }
   }
 });
 </script>
 
 <style lang="less">
+
+.custom{
+  --placeholder-color: gray;
+  --placeholder-font-style:italic;
+  --placeholder-opacity: 1;
+}
+
+.title-item{
+  margin-left: 15px;
+  color:#3a7be0;
+  font-size: 20px;
+}
+
 ion-item {
   --border-width: 0;
   --border-style: none;
@@ -213,4 +315,84 @@ ion-item {
     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>

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

@@ -3,7 +3,7 @@
     <ion-header class="header-theme2">
       <ion-toolbar>
         <ion-buttons slot="start">
-          <ion-icon :icon="arrowBackOutline" @click="back"></ion-icon>
+          <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
         </ion-buttons>
         <ion-title>企业信息收集</ion-title>
         <ion-buttons slot="end">
@@ -138,44 +138,43 @@ export default defineComponent({
     }
 
     const onAdd = () => {
-      router.push({path: './edit', query: {reload: 1,id: "",status: 1}});
+      router.push({path: './edit', query: {reload: 1,id: null,status: 1}});
     }
 
     const onEdit = (companyID:string) => {
       router.push({path: './menu', query: {reload: 1,id: companyID,status: 2}});
     }
 
-    const search = () => {
+    const onSearch = () => {
       loadData();
     }
 
-    const back = () => {
-      router.push({path: '../', query: {reload: 1, date: new Date().getTime()}});
+    const onBack = () => {
+      router.push('../');
     }
 
     onIonViewDidEnter(() => {
-      reload();
+      if(route.query.reload)reload();
     });
 
     return {
+      ellipse,
+      arrowBackOutline,
+      addCircleOutline,
       router,
-      back,
-      pagination,
       colors,
-      reload,
+      total,
       loading,
       dataList,
-      total,
-      dayjs,
-      onScroll,
-      onAdd,
-      loadData,
-      ellipse,
-      arrowBackOutline,
-      addCircleOutline,
+      pagination,
       searchParams,
+      onBack,
+      onAdd,
       onEdit,
-      search
+      onSearch,
+      onScroll,
+      loadData,
+      dayjs,
     }
   }
 });

h5app/src/views/pages/company/menu.vue

@@ -14,9 +14,9 @@
       <div class="stepFlex">
         <div v-for="(record,key) in stepList" :key="key" class="stepFlex-item">
           <div
-              :class="[(record.val < curStepData?.statusVal || curStepData?.statusVal == stepList[stepList.length-1].val) ? 'greenCircle' :record.val == curStepData?.statusVal ? 'now' : 'greyCircle']"></div>
+              :class="[(record.val < curStepData?.statusVal || curStepData?.statusVal == stepList[stepList.length-1].val) ? 'greenCircle' :record.val == curStepData?.statusVal ? 'now' : 'grayCircle']"></div>
           <div v-if="key !== stepList.length - 1"
-               :class="[record.val < curStepData?.statusVal ? 'greenline' : 'greyline']"></div>
+               :class="[record.val < curStepData?.statusVal ? 'greenLine' : 'grayLine']"></div>
           <div class="stepFlex-item-label">
             <p class="stepFlex-item-label-title">{{ record.title }}</p>
             <p class="stepFlex-item-label-desc">{{ record.desc }}</p>
@@ -30,9 +30,15 @@
            </h2>
          </ion-label>
        </ion-item>
-      <ion-item style="padding-left: 75px;">
-          <ion-button expand="block" style="width: 140px;height:50px;font-size: 22px;margin-right: 10px;" @click="onPathForward('./edit',2)">信息维护</ion-button>
-          <ion-button expand="block" style="width: 140px;height:50px;font-size: 22px;margin-left: 10px;" @click="onPathForward('./postList',3)">岗位管理</ion-button>
+      <ion-item style="padding-left: 55px;">
+        <ion-grid>
+          <ion-row>
+            <ion-col style="text-align: center;">
+              <ion-button expand="block" style="display: inline-block; width: 120px;height:45px;font-size: 20px;" @click="onPathForward('./edit',1)">信息维护</ion-button>
+              <ion-button expand="block" style="display: inline-block; width: 120px;height:45px;font-size: 20px;"  @click="onPathForward('./postList',3)">岗位管理</ion-button>
+            </ion-col>
+          </ion-row>
+        </ion-grid>
       </ion-item>
     </ion-content>
     <ion-footer>
@@ -75,6 +81,15 @@ export default defineComponent({
         {title: '', desc: '', val: 2},
         {title: '岗位信息', desc: '企业岗位信息', val: 3}
     ]);
+
+    const onBack=()=>{
+      router.push({path:'./list',query:{reload:1}});
+    };
+
+    const onPathForward = (pathValue:string,statusValue:any)=>{
+      router.push({path: pathValue, query: {reload:1,id:formData.dataModel.companyID,status:statusValue}});
+    };
+
     const loadData = async (companyID:any,status:any)=>{
       loading.value = true;
       curStepData.value.statusVal = status;
@@ -83,7 +98,11 @@ export default defineComponent({
       formData.dataModel = reqData;
       console.log("dataModel",formData.dataModel);
       loading.value = false;
-    }
+    };
+
+    const reload = (companyID:any,status:any) => {
+      loadData(companyID,status);
+    };
 
     watch(() => route.query, () => {
       if (route.query.reload) {
@@ -91,23 +110,12 @@ export default defineComponent({
       }
     });
 
-    const reload = (companyID:any,status:any) => {
-      loadData(companyID,status);
-    }
-
     onIonViewDidEnter(() => {
       if (route.query.reload) {
         reload(route.query.id,route.query.status)
       }
     });
 
-    const onPathForward = (pathValue:string,statusValue:any)=>{
-      router.push({path: pathValue, query: {reload:1,companyID:formData.dataModel.companyID,status:statusValue}});
-    }
-
-    const onBack=()=>{
-      router.push('./list');
-    }
 
     return {
       ...toRefs(formData),
@@ -189,7 +197,7 @@ ion-item {
     border: 4px solid #c5e8f9;
   }
 
-  .greyCircle {
+  .grayCircle {
     top: calc(50% - 15px);
     left: calc(50% - 4px);
     position: absolute;
@@ -200,7 +208,7 @@ ion-item {
     background-color: #ccc;
   }
 
-  .greenline {
+  .greenLine {
     width: 100%;
     top: calc(50% - 11px);
     left: calc(50% - 2px);
@@ -209,7 +217,7 @@ ion-item {
     position: absolute;
   }
 
-  .greyline {
+  .grayLine {
     height: 0;
     border: 1px dashed #ccc;
     width: 100%;

h5app/src/views/pages/company/postList.vue

@@ -1,9 +1,9 @@
 <template>
-  <ion-page class="list-page company-list-page">
+  <ion-page class="list-page post-list-page">
     <ion-header class="header-theme2">
       <ion-toolbar>
         <ion-buttons slot="start">
-          <ion-icon :icon="arrowBackOutline" @click="back"></ion-icon>
+          <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
         </ion-buttons>
         <ion-title>
           企业信息收集
@@ -11,33 +11,27 @@
       </ion-toolbar>
     </ion-header>
     <ion-content>
-      <div class="stepFlex" v-if="!isEdit">
+      <div class="stepFlex">
         <div v-for="(record,key) in stepList" :key="key" class="stepFlex-item">
           <div
-              :class="[(record.val < formState.dataModel?.statusVal || formState.dataModel?.statusVal==stepList[stepList.length-1].val) ? 'greenCircle' :record.val == formState.dataModel?.statusVal ? 'now' : 'greyCircle']"></div>
+              :class="[(record.val < curStepData?.statusVal || curStepData?.statusVal==stepList.val) ? 'greenCircle' :record.val == curStepData?.statusVal ? 'now' : 'grayCircle']"></div>
           <div v-if="key !== stepList.length - 1"
-               :class="[record.val < formState.dataModel?.statusVal ? 'greenline' : 'greyline']"></div>
+               :class="[record.val < curStepData?.statusVal ? 'greenLine' : 'grayLine']"></div>
           <div class="stepFlex-item-label">
             <p class="stepFlex-item-label-title">{{ record.title }}</p>
             <p class="stepFlex-item-label-desc">{{ record.desc }}</p>
           </div>
         </div>
       </div>
-      <ion-list class="list-content">
+      <ion-list>
         <ion-item>
-          <ion-grid>
-            <ion-row>
-              <ion-col size="9">
-                <span style="background-color: #3a7be0;display: inline-block;width: 3px;color: transparent;">|</span>
-                &nbsp;岗位信息
-              </ion-col>
-              <ion-col style="text-align: right;">
-                <ion-icon :icon="addCircleOutline" @click="onAdd()" style="font-size: 24px;"></ion-icon>
-              </ion-col>
-            </ion-row>
-          </ion-grid>
+          <div class="panel-title2">
+            <div class="item-flag"></div>
+            岗位信息
+          </div>
+          <ion-icon slot="end" :icon="addCircleOutline" @click="onAdd()" style="font-size: 24px;"></ion-icon>
         </ion-item>
-        <ion-item v-for="(record,key) in postList" :key="key" detail>
+        <ion-item v-for="(record,key) in postList" :key="key" detail @click="onEdit(record.postID)">
           <ion-grid>
             <ion-row>
               <ion-col>
@@ -51,9 +45,11 @@
             <ion-row>
               <ion-col size="8">
                 <ion-label>
-                  <p>
-                    <!--                    {{ record.jobVacancyTime }}至{{ calculateEndDate(record.jobVacancyTime, record.validDay) }}-->
-                    {{ record.validTime }}至{{ calculateEndDate(record.validTime, record.validDay) }}
+                  <p v-if="record.startTime!=null&&record.endTime!=null">
+                    {{ dayjs(record.startTime).format("YYYY-MM-DD") }}至{{ dayjs(record.endTime).format("YYYY-MM-DD") }}
+                  </p>
+                  <p v-if="record.startTime==null||record.endTime==null">
+                    暂未设置有效期限
                   </p>
                 </ion-label>
               </ion-col>
@@ -68,45 +64,52 @@
           </ion-grid>
         </ion-item>
       </ion-list>
+      <ion-infinite-scroll  threshold="100px" @ionInfinite="onScroll($event)">
+        <ion-infinite-scroll-content
+            :loadingText="pageParams.total>pageParams.pageIndex*pageParams.pageSize?'正在加载...':'暂无更多'"
+            loadingSpinner="bubbles">
+        </ion-infinite-scroll-content>
+      </ion-infinite-scroll>
     </ion-content>
-    <ion-footer>
+<!--    <ion-footer>
       <ion-toolbar>
         <div slot="end">
           <ion-button shape="round" expand="block" @click="onSave">提交</ion-button>
         </div>
       </ion-toolbar>
-    </ion-footer>
+    </ion-footer>-->
   </ion-page>
 </template>
 <script lang="ts">
-import {computed, defineComponent, reactive, ref, watch} from "vue";
+import {defineComponent, reactive, ref} from "vue";
 import {useRoute, useRouter} from "vue-router";
-import {alertController, onIonViewDidEnter, loadingController} from "@ionic/vue";
+import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {arrowBackOutline, addCircleOutline} from 'ionicons/icons';
-import {saveCompanyPost, getCompanyPostList, getCompanyById} from '@/api/company/index'
+import {getCompanyPostList} from '@/api/company/index'
 import dayjs from "dayjs";
 
-interface FormState {
-  dataModel: any;
-}
-
-interface PostModel {
-  postName?: string | null,
-  recruitCount?: number | null,
-  // jobVacancyTime?: string | null,
-  validTime?: string | null,
-  validDay: number | null
+interface StepParams{
+  name: string,
+  statusVal: number
 }
 
 export default defineComponent({
-  name: 'editPost',
+  name: 'PostList',
   setup() {
-    const loading = ref(false);
     const router = useRouter();
     const route = useRoute();
-    const isEdit = ref<any>();
-    const postList = ref<PostModel[]>([]);
-    const formState = reactive<FormState>({dataModel: {}});
+    const loading = ref(false);
+    const postList = ref<any>([]);
+    const pageParams = reactive({
+      pageIndex: 1,
+      pageSize: 10,
+      total:0,
+      companyID:''
+    });
+    const curStepData = ref<StepParams>({
+      name:"",
+      statusVal: 1
+    });
     const stepList = ref([
       {
         title: '基础信息',
@@ -116,15 +119,49 @@ export default defineComponent({
       {
         title: '岗位信息',
         desc: '企业岗位信息',
-        val: 2
+        val: 3
       }]);
+    const presentAlert = async (message: string) => {
+      const alert = await alertController.create({
+        header: '错误！',
+        message: message,
+        buttons: [
+          '确定'
+        ],
+      });
+
+      await alert.present();
+    };
 
-    const onSave = () => {
+    // 计算截止日期的方法
+   /* const calculateEndDate = (validTime: any, validDay: any) => {
+      const validDate = new Date(validTime);
+      validDate.setDate(validDate.getDate() + Number.parseInt(validDay));
+      // 获取年月日
+      const year = validDate.getFullYear();
+      const month = validDate.getMonth() + 1; // 注意月份是从0开始的，需要加1
+      const day = validDate.getDate();
+      return `${year}-${month}-${day}`;
+    };*/
+
+    const onAdd = () => {
+      router.push({path: './editPost', query: {reload:1,id: null,companyID:pageParams.companyID}});
+    };
+    const onEdit = (postID:any) => {
+      router.push({path: './editPost', query: {reload:1,id:postID,companyID:pageParams.companyID}});
+    };
+    const onBack = () => {
+      if(curStepData.value.statusVal==3)
+        router.push({path: './menu', query: {reload:1,id:pageParams.companyID,status:2}});
+      else if(curStepData.value.statusVal==2)
+        router.push({path: './edit', query: {reload:1,companyID:pageParams.companyID,status:1}});
+    };
+    /*const onSave = () => {
       if (postList.value.length == 0) {
         presentAlert('没有要提交的岗位信息！');
         return null;
       }
-      if (route.query.id) {
+      /!*if (route.query.id) {
         getCompanyById(route.query.id + "").then(data => {
           formState.dataModel = data;
           formState.dataModel.postData = postList.value;
@@ -143,115 +180,61 @@ export default defineComponent({
             router.push({path: './list', query: {success: 1}});
           }
         })
-      }
+      }*!/
+    };*/
+    const onScroll = (e: any) => {
+      setTimeout(() => {
+        e.target.complete();
+        if (pageParams.total > pageParams.pageIndex * pageParams.pageSize) {
+          pageParams.pageSize += 10;
+          loadData(pageParams.companyID,curStepData.value.statusVal);
+        }
+      }, 500);
     }
-
-    const loadData = () => {
+    const loadData = async function (companyID:any,status:any) {
       loading.value = true;
-      postList.value = [];
-      getCompanyPostList({companyID: route.query.id, pageSize: 999, pageIndex: 1}).then(data => {
-        postList.value = data.list;
-        formatDataList();
-        loading.value = false;
-        console.log(postList.value);
-      });
-    }
-
-    const initData = () => {
-      if (route.query.id) {
-        isEdit.value = true;
-      }
-      if (route.query.pageStatus == "3") {
-        const jsonPostList = localStorage.getItem("postData");
-        postList.value = JSON.parse(jsonPostList ?? "");
-        formatDataList();
-        console.log(postList);
-      }
-      if (route.query.id && route.query.pageStatus == "1") {
-        loadData();
-      } else if (!route.query.id && route.query.pageStatus == "1") {
-        isEdit.value = false;
-        formState.dataModel.statusVal = 2;
-        postList.value = [];
-      }
-    }
-
-    onIonViewDidEnter(() => {
-      initData();
-    });
-
-    const formatDataList = () => {
-      postList.value.map(item => {
-        if (item.validTime)
-          item.validTime = dayjs(item.validTime).format("YYYY-MM-DD");
-      });
-    }
-
-    const onAdd = () => {
-      const jsonPostList = JSON.stringify(postList.value);
-      localStorage.removeItem("postData");
-      localStorage.setItem("postData", jsonPostList);
-      if (route.query.id) {
-        router.push({path: './editPost', query: {addStatus: 1, id: route.query.id}});
-      } else {
-        router.push({path: './editPost', query: {addStatus: 1}});
-      }
-    }
-
-    // 计算截止日期的方法
-    const calculateEndDate = (validTime: any, validDay: any) => {
-      debugger;
-      const validDate = new Date(validTime);
-      validDate.setDate(validDate.getDate() + Number.parseInt(validDay));
-      // 获取年月日
-      const year = validDate.getFullYear();
-      const month = validDate.getMonth() + 1; // 注意月份是从0开始的，需要加1
-      const day = validDate.getDate();
-      return `${year}-${month}-${day}`;
+      pageParams.companyID = companyID;
+      curStepData.value.statusVal = status;
+      console.log(pageParams);
+      const result:any = await getCompanyPostList(pageParams);
+      postList.value = postList.value.concat(result.list);
+      pageParams.total = result.total;
+      console.log(postList.value);
+      loading.value = false;
     };
 
-    const back = () => {
-      if (isEdit.value) {
-        router.push({path: './list'});
-      } else {
-        router.push({path: './edit', query: {pageStatus: 2}});
-      }
-    }
-
-    const presentAlert = async (message: string) => {
-      const alert = await alertController.create({
-        header: '错误！',
-        message: message,
-        buttons: [
-          '确定'
-        ],
-      });
-
-      await alert.present();
-    }
+    const reload = (companyID:any,status:any) => {
+      pageParams.pageIndex = 1;
+      postList.value = [];
+      loadData(companyID,status);
+      /*const jsonPostList = localStorage.getItem("postData");
+      postList.value = JSON.parse(jsonPostList ?? "");*/
+    };
 
-    watch(() => route.query, () => {
-      if (route.query.date) {
-        if (route.query.id && route.query.pageStatus == "1")
-          loadData();
-      }
+    onIonViewDidEnter(() => {
+      if (route.query.reload)
+        reload(route.query.id,route.query.status);
     });
 
     return {
-      formState,
-      onAdd,
-      postList,
-      stepList,
-      onSave,
-      calculateEndDate,
-      route,
       arrowBackOutline,
       addCircleOutline,
-      presentAlert,
+      route,
       router,
-      isEdit,
-      back,
-      loading
+      loading,
+      pageParams,
+      curStepData,
+      postList,
+      stepList,
+      onBack,
+      onAdd,
+      onEdit,
+      /*onSave,*/
+      onScroll,
+      loadData,
+      presentAlert,
+      /*calculateEndDate,*/
+      dayjs
     }
   }
 });
@@ -316,7 +299,7 @@ export default defineComponent({
     border: 4px solid #c5e8f9;
   }
 
-  .greyCircle {
+  .grayCircle {
     top: calc(50% - 15px);
     left: calc(50% - 4px);
     position: absolute;
@@ -327,7 +310,7 @@ export default defineComponent({
     background-color: #ccc;
   }
 
-  .greenline {
+  .greenLine {
     width: 100%;
     top: calc(50% - 11px);
     left: calc(50% - 2px);
@@ -336,7 +319,7 @@ export default defineComponent({
     position: absolute;
   }
 
-  .greyline {
+  .grayLine {
     height: 0;
     border: 1px dashed #ccc;
     width: 100%;
@@ -346,7 +329,7 @@ export default defineComponent({
   }
 
 
-  .company-list-page {
+  .post-list-page {
     .list-content {
       margin: 0px 15px !important;
       background-color: white !important;

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

@@ -388,7 +388,7 @@ export default defineComponent({
       }});
     const pageParams = reactive({
       pageIndex: 1,
-      pageSize: 7,
+      pageSize: 10,
       total:0,
       jobUserID:''
     });
@@ -607,9 +607,6 @@ export default defineComponent({
     this.getSelectorDataList();
     this.getRegionList();
     this.getStreetList();
-    const jobUserID = this.route.query.jobUserID;
-    const status = this.route.query.status;
-    this.loadData(jobUserID,status);
   }
 });
 </script>

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

@@ -80,7 +80,7 @@ export default defineComponent({
       setTimeout(() => {
         e.target.complete();
         if (searchParamsState.total > searchParamsState.pageIndex * searchParamsState.pageSize) {
-          searchParamsState.pageIndex += 1;
+          searchParamsState.pageSize += 10;
           loadData();
         }
       }, 500);

h5app/src/views/pages/work/task/edit.vue

@@ -48,7 +48,7 @@
           <ion-item :class="[workTaskValid.dataModel.workTypeID.$error?'ion-invalid':'ion-valid']"  style="margin-bottom: 10px;">
             <ion-select name="workTypeID"  id="workTypeID" okText="确定" cancelText="取消"  v-model="dataModel.workTypeID"
                         interface="action-sheet" placeholder="请选择任务类型" style="width:100%;text-align: left;"  >
-              <ion-select-option v-for=" (it,key) in taskTypeList" :key="key" :value="it.value" >
+              <ion-select-option v-for="(it,key) in taskTypeList" :key="key" :value="it.value" >
                 {{ it.name }}
               </ion-select-option>
             </ion-select>

h5app/src/views/sapp/tabMain.vue

@@ -14,7 +14,7 @@
               </div>
               <div class="tool-title">求职信息收集</div>
             </a>
-            <a class="tool-item box-line"  @click="router.push({path:'/tabs/tabMain/company/list',query:{date:new Date().getTime()}})">
+            <a class="tool-item box-line"  @click="router.push({path:'/tabs/tabMain/company/list',query:{reload:1}})">
               <div class="tool-img">
                 <img src="@/assets/icon/qyxx.png">
               </div>

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

@@ -33,6 +33,7 @@ public class CompanyController {
     @Autowired
     private ExcelHelper excelHelper;
 
+
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse<PageInfo<CompanyVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
@@ -50,10 +51,10 @@ public class CompanyController {
         var data = companyService.getDataById(id);
         if (data == null) {
             data = new CompanyVo();
-            data.companyID=UUID.randomUUID().toString();
-            data.recordStatus =1;
-            data.validTime="2099-12-31";
-            data.isShortage=1;
+            data.companyID = UUID.randomUUID().toString();
+            data.recordStatus = 1;
+            data.validDate = dateUtils.StrToDate("2099-12-31 00:00:00") ;
+            data.isShortage = 1;
         }
         return RespGenerstor.success(data);
     }

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

@@ -15,9 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 @RestController
 @RequestMapping(value = "/api/companyService/post")
@@ -87,6 +85,9 @@ public class PostController {
         var data = postService.getDataById(id);
         if (data == null) {
             data = new PostVo();
+            data.postID = UUID.randomUUID().toString();
+            data.startTime = new Date();
+            data.endTime = new Date();
         }
         return RespGenerstor.success(data);
     }

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

@@ -34,8 +34,8 @@ public class EducationController {
         PcEducation dataModel = new PcEducation();
         if (educationID == null || educationID == ""){
             dataModel.setEducationID(UUID.randomUUID().toString());
-            dataModel.setSchoolTime(new java.sql.Date(new Date().getTime()));
-            dataModel.setOverTime(new java.sql.Date(new Date().getTime()));
+            dataModel.setSchoolTime(new Date());
+            dataModel.setOverTime(new Date());
         }else{
             dataModel = educationService.getById(educationID);
         }

src/main/java/com/hz/employmentsite/model/PcCompany.java

@@ -23,7 +23,7 @@ public class PcCompany {
 
     private String companyType;
 
-    private String address;
+    private String companyAddress;
 
     private String userName;
 
@@ -33,7 +33,9 @@ public class PcCompany {
 
     private String frName;
 
-    private String validTime;
+    private Date validDate;
+
+    private Integer isShortage;
 
     private Integer recordStatus;
 
@@ -45,8 +47,6 @@ public class PcCompany {
 
     private Date modifyTime;
 
-    private Integer isShortage;
-
     public String getCompanyID() {
         return companyID;
     }
@@ -127,12 +127,12 @@ public class PcCompany {
         this.companyType = companyType == null ? null : companyType.trim();
     }
 
-    public String getAddress() {
-        return address;
+    public String getCompanyAddress() {
+        return companyAddress;
     }
 
-    public void setAddress(String address) {
-        this.address = address == null ? null : address.trim();
+    public void setCompanyAddress(String companyAddress) {
+        this.companyAddress = companyAddress == null ? null : companyAddress.trim();
     }
 
     public String getUserName() {
@@ -167,12 +167,20 @@ public class PcCompany {
         this.frName = frName == null ? null : frName.trim();
     }
 
-    public String getValidTime() {
-        return validTime;
+    public Date getValidDate() {
+        return validDate;
+    }
+
+    public void setValidDate(Date validDate) {
+        this.validDate = validDate;
+    }
+
+    public Integer getIsShortage() {
+        return isShortage;
     }
 
-    public void setValidTime(String validTime) {
-        this.validTime = validTime == null ? null : validTime.trim();
+    public void setIsShortage(Integer isShortage) {
+        this.isShortage = isShortage;
     }
 
     public Integer getRecordStatus() {
@@ -214,12 +222,4 @@ public class PcCompany {
     public void setModifyTime(Date modifyTime) {
         this.modifyTime = modifyTime;
     }
-
-    public Integer getIsShortage() {
-        return isShortage;
-    }
-
-    public void setIsShortage(Integer isShortage) {
-        this.isShortage = isShortage;
-    }
 }

src/main/java/com/hz/employmentsite/model/PcCompanyExample.java

@@ -785,73 +785,73 @@ public class PcCompanyExample {
             return (Criteria) this;
         }
 
-        public Criteria andAddressIsNull() {
-            addCriterion("Address is null");
+        public Criteria andCompanyAddressIsNull() {
+            addCriterion("CompanyAddress is null");
             return (Criteria) this;
         }
 
-        public Criteria andAddressIsNotNull() {
-            addCriterion("Address is not null");
+        public Criteria andCompanyAddressIsNotNull() {
+            addCriterion("CompanyAddress is not null");
             return (Criteria) this;
         }
 
-        public Criteria andAddressEqualTo(String value) {
-            addCriterion("Address =", value, "address");
+        public Criteria andCompanyAddressEqualTo(String value) {
+            addCriterion("CompanyAddress =", value, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressNotEqualTo(String value) {
-            addCriterion("Address <>", value, "address");
+        public Criteria andCompanyAddressNotEqualTo(String value) {
+            addCriterion("CompanyAddress <>", value, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressGreaterThan(String value) {
-            addCriterion("Address >", value, "address");
+        public Criteria andCompanyAddressGreaterThan(String value) {
+            addCriterion("CompanyAddress >", value, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressGreaterThanOrEqualTo(String value) {
-            addCriterion("Address >=", value, "address");
+        public Criteria andCompanyAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("CompanyAddress >=", value, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressLessThan(String value) {
-            addCriterion("Address <", value, "address");
+        public Criteria andCompanyAddressLessThan(String value) {
+            addCriterion("CompanyAddress <", value, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressLessThanOrEqualTo(String value) {
-            addCriterion("Address <=", value, "address");
+        public Criteria andCompanyAddressLessThanOrEqualTo(String value) {
+            addCriterion("CompanyAddress <=", value, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressLike(String value) {
-            addCriterion("Address like", value, "address");
+        public Criteria andCompanyAddressLike(String value) {
+            addCriterion("CompanyAddress like", value, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressNotLike(String value) {
-            addCriterion("Address not like", value, "address");
+        public Criteria andCompanyAddressNotLike(String value) {
+            addCriterion("CompanyAddress not like", value, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressIn(List<String> values) {
-            addCriterion("Address in", values, "address");
+        public Criteria andCompanyAddressIn(List<String> values) {
+            addCriterion("CompanyAddress in", values, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressNotIn(List<String> values) {
-            addCriterion("Address not in", values, "address");
+        public Criteria andCompanyAddressNotIn(List<String> values) {
+            addCriterion("CompanyAddress not in", values, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressBetween(String value1, String value2) {
-            addCriterion("Address between", value1, value2, "address");
+        public Criteria andCompanyAddressBetween(String value1, String value2) {
+            addCriterion("CompanyAddress between", value1, value2, "companyAddress");
             return (Criteria) this;
         }
 
-        public Criteria andAddressNotBetween(String value1, String value2) {
-            addCriterion("Address not between", value1, value2, "address");
+        public Criteria andCompanyAddressNotBetween(String value1, String value2) {
+            addCriterion("CompanyAddress not between", value1, value2, "companyAddress");
             return (Criteria) this;
         }
 
@@ -1135,73 +1135,123 @@ public class PcCompanyExample {
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeIsNull() {
-            addCriterion("ValidTime is null");
+        public Criteria andValidDateIsNull() {
+            addCriterion("ValidDate is null");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeIsNotNull() {
-            addCriterion("ValidTime is not null");
+        public Criteria andValidDateIsNotNull() {
+            addCriterion("ValidDate is not null");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeEqualTo(String value) {
-            addCriterion("ValidTime =", value, "validTime");
+        public Criteria andValidDateEqualTo(Date value) {
+            addCriterion("ValidDate =", value, "validDate");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeNotEqualTo(String value) {
-            addCriterion("ValidTime <>", value, "validTime");
+        public Criteria andValidDateNotEqualTo(Date value) {
+            addCriterion("ValidDate <>", value, "validDate");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeGreaterThan(String value) {
-            addCriterion("ValidTime >", value, "validTime");
+        public Criteria andValidDateGreaterThan(Date value) {
+            addCriterion("ValidDate >", value, "validDate");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeGreaterThanOrEqualTo(String value) {
-            addCriterion("ValidTime >=", value, "validTime");
+        public Criteria andValidDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("ValidDate >=", value, "validDate");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeLessThan(String value) {
-            addCriterion("ValidTime <", value, "validTime");
+        public Criteria andValidDateLessThan(Date value) {
+            addCriterion("ValidDate <", value, "validDate");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeLessThanOrEqualTo(String value) {
-            addCriterion("ValidTime <=", value, "validTime");
+        public Criteria andValidDateLessThanOrEqualTo(Date value) {
+            addCriterion("ValidDate <=", value, "validDate");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeLike(String value) {
-            addCriterion("ValidTime like", value, "validTime");
+        public Criteria andValidDateIn(List<Date> values) {
+            addCriterion("ValidDate in", values, "validDate");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeNotLike(String value) {
-            addCriterion("ValidTime not like", value, "validTime");
+        public Criteria andValidDateNotIn(List<Date> values) {
+            addCriterion("ValidDate not in", values, "validDate");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeIn(List<String> values) {
-            addCriterion("ValidTime in", values, "validTime");
+        public Criteria andValidDateBetween(Date value1, Date value2) {
+            addCriterion("ValidDate between", value1, value2, "validDate");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeNotIn(List<String> values) {
-            addCriterion("ValidTime not in", values, "validTime");
+        public Criteria andValidDateNotBetween(Date value1, Date value2) {
+            addCriterion("ValidDate not between", value1, value2, "validDate");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeBetween(String value1, String value2) {
-            addCriterion("ValidTime between", value1, value2, "validTime");
+        public Criteria andIsShortageIsNull() {
+            addCriterion("IsShortage is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsShortageIsNotNull() {
+            addCriterion("IsShortage is not null");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeNotBetween(String value1, String value2) {
-            addCriterion("ValidTime not between", value1, value2, "validTime");
+        public Criteria andIsShortageEqualTo(Integer value) {
+            addCriterion("IsShortage =", value, "isShortage");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsShortageNotEqualTo(Integer value) {
+            addCriterion("IsShortage <>", value, "isShortage");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsShortageGreaterThan(Integer value) {
+            addCriterion("IsShortage >", value, "isShortage");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsShortageGreaterThanOrEqualTo(Integer value) {
+            addCriterion("IsShortage >=", value, "isShortage");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsShortageLessThan(Integer value) {
+            addCriterion("IsShortage <", value, "isShortage");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsShortageLessThanOrEqualTo(Integer value) {
+            addCriterion("IsShortage <=", value, "isShortage");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsShortageIn(List<Integer> values) {
+            addCriterion("IsShortage in", values, "isShortage");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsShortageNotIn(List<Integer> values) {
+            addCriterion("IsShortage not in", values, "isShortage");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsShortageBetween(Integer value1, Integer value2) {
+            addCriterion("IsShortage between", value1, value2, "isShortage");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsShortageNotBetween(Integer value1, Integer value2) {
+            addCriterion("IsShortage not between", value1, value2, "isShortage");
             return (Criteria) this;
         }
 
@@ -1524,66 +1574,6 @@ public class PcCompanyExample {
             addCriterion("ModifyTime not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
-
-        public Criteria andIsShortageIsNull() {
-            addCriterion("IsShortage is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageIsNotNull() {
-            addCriterion("IsShortage is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageEqualTo(Integer value) {
-            addCriterion("IsShortage =", value, "isShortage");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageNotEqualTo(Integer value) {
-            addCriterion("IsShortage <>", value, "isShortage");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageGreaterThan(Integer value) {
-            addCriterion("IsShortage >", value, "isShortage");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageGreaterThanOrEqualTo(Integer value) {
-            addCriterion("IsShortage >=", value, "isShortage");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageLessThan(Integer value) {
-            addCriterion("IsShortage <", value, "isShortage");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageLessThanOrEqualTo(Integer value) {
-            addCriterion("IsShortage <=", value, "isShortage");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageIn(List<Integer> values) {
-            addCriterion("IsShortage in", values, "isShortage");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageNotIn(List<Integer> values) {
-            addCriterion("IsShortage not in", values, "isShortage");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageBetween(Integer value1, Integer value2) {
-            addCriterion("IsShortage between", value1, value2, "isShortage");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsShortageNotBetween(Integer value1, Integer value2) {
-            addCriterion("IsShortage not between", value1, value2, "isShortage");
-            return (Criteria) this;
-        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/hz/employmentsite/model/PcInstitution.java

@@ -21,6 +21,8 @@ public class PcInstitution {
 
     private String companyDesc;
 
+    private String remaark;
+
     private String createUserID;
 
     private Date createTime;
@@ -101,6 +103,14 @@ public class PcInstitution {
         this.companyDesc = companyDesc == null ? null : companyDesc.trim();
     }
 
+    public String getRemaark() {
+        return remaark;
+    }
+
+    public void setRemaark(String remaark) {
+        this.remaark = remaark == null ? null : remaark.trim();
+    }
+
     public String getCreateUserID() {
         return createUserID;
     }

src/main/java/com/hz/employmentsite/model/PcInstitutionExample.java

@@ -735,6 +735,76 @@ public class PcInstitutionExample {
             return (Criteria) this;
         }
 
+        public Criteria andRemaarkIsNull() {
+            addCriterion("Remaark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkIsNotNull() {
+            addCriterion("Remaark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkEqualTo(String value) {
+            addCriterion("Remaark =", value, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkNotEqualTo(String value) {
+            addCriterion("Remaark <>", value, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkGreaterThan(String value) {
+            addCriterion("Remaark >", value, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkGreaterThanOrEqualTo(String value) {
+            addCriterion("Remaark >=", value, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkLessThan(String value) {
+            addCriterion("Remaark <", value, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkLessThanOrEqualTo(String value) {
+            addCriterion("Remaark <=", value, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkLike(String value) {
+            addCriterion("Remaark like", value, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkNotLike(String value) {
+            addCriterion("Remaark not like", value, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkIn(List<String> values) {
+            addCriterion("Remaark in", values, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkNotIn(List<String> values) {
+            addCriterion("Remaark not in", values, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkBetween(String value1, String value2) {
+            addCriterion("Remaark between", value1, value2, "remaark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemaarkNotBetween(String value1, String value2) {
+            addCriterion("Remaark not between", value1, value2, "remaark");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateUserIDIsNull() {
             addCriterion("CreateUserID is null");
             return (Criteria) this;

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -78,7 +78,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setSiteID(data.getSiteID());
             dbData.setRegionCode(data.getRegionCode());
             dbData.setStreetCode(data.getStreetCode());
-            dbData.setAddress(data.getAddress());
+            dbData.setCompanyAddress(data.getCompanyAddress());
             dbData.setWorkSituation(data.getWorkSituation());
             dbData.setCompanyModel(data.getCompanyModel());
             dbData.setCompanyType(data.getCompanyType());
@@ -86,7 +86,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setUserMobile(data.getUserMobile());
             dbData.setCompanyEmail(data.getCompanyEmail());
             dbData.setFrName(data.getFrName());
-            dbData.setValidTime(data.getValidTime());
+            dbData.setValidDate(data.getValidDate());
             dbData.setRecordStatus(data.getRecordStatus());
             dbData.setBusinScope(data.getBusinScope());
             dbData.setCompanyDesc(data.getCompanyDesc());
@@ -104,7 +104,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setSiteID(data.getSiteID());
             dbData.setRegionCode(data.getRegionCode());
             dbData.setStreetCode(data.getStreetCode());
-            dbData.setAddress(data.getAddress());
+            dbData.setCompanyAddress(data.getCompanyAddress());
             dbData.setWorkSituation(data.getWorkSituation());
             dbData.setCompanyModel(data.getCompanyModel());
             dbData.setCompanyType(data.getCompanyType());
@@ -112,7 +112,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setUserMobile(data.getUserMobile());
             dbData.setCompanyEmail(data.getCompanyEmail());
             dbData.setFrName(data.getFrName());
-            dbData.setValidTime(data.getValidTime());
+            dbData.setValidDate(data.getValidDate());
             dbData.setRecordStatus(data.getRecordStatus());
             dbData.setBusinScope(data.getBusinScope());
             dbData.setCompanyDesc(data.getCompanyDesc());
@@ -138,7 +138,7 @@ public class CompanyServiceImpl implements CompanyService {
         if (stringUtils.IsNullOrEmpty(id)) {
             return null;
         }
-        return companyCQuery.getList(id, null, null, null, null, null).stream().findFirst().orElse(null);
+        return  companyCQuery.getList(id, null, null, null, null, null).stream().findFirst().orElse(null);
     }
 
     @Override
@@ -190,7 +190,7 @@ public class CompanyServiceImpl implements CompanyService {
                 if (stringUtils.IsNullOrEmpty(item.streetCode))
                     errorInfo += "县区名称不存在！";
             }
-            if (stringUtils.IsNullOrEmpty(item.address))
+            if (stringUtils.IsNullOrEmpty(item.companyAddress))
                 errorInfo += "请填写企业办公地址!";
             if (stringUtils.IsNullOrEmpty(item.workSituation))
                 errorInfo += "请填写用工情况!";
@@ -212,7 +212,7 @@ public class CompanyServiceImpl implements CompanyService {
                 errorInfo += "请填写法定代表人!";
             if (stringUtils.IsNullOrEmpty(String.valueOf(item.insuredCount)))
                 errorInfo += "请填写企业参保人数!";
-            if (stringUtils.IsNullOrEmpty(String.valueOf(item.validTime)))
+            if (stringUtils.IsNullOrEmpty(String.valueOf(item.validDate)))
                 errorInfo += "请填写营业执照有效期!";
             if (stringUtils.IsNullOrEmpty(String.valueOf(item.businScope)))
                 errorInfo += "请填写经营范围!";

src/main/java/com/hz/employmentsite/vo/companyService/CompanyVo.java

@@ -25,7 +25,7 @@ public class CompanyVo {
 
     public String companyType;
 
-    public String address;
+    public String companyAddress;
 
     public String userName;
 
@@ -34,7 +34,8 @@ public class CompanyVo {
     public String companyEmail;
 
     public String frName;
-    public String validTime;
+
+    public Date validDate;
 
     public Integer recordStatus;
 

src/main/resources/mapping/PcCompanyMapper.xml

@@ -12,18 +12,18 @@
     <result column="CompanyModel" jdbcType="INTEGER" property="companyModel" />
     <result column="WorkSituation" jdbcType="VARCHAR" property="workSituation" />
     <result column="CompanyType" jdbcType="VARCHAR" property="companyType" />
-    <result column="Address" jdbcType="VARCHAR" property="address" />
+    <result column="CompanyAddress" jdbcType="VARCHAR" property="companyAddress" />
     <result column="UserName" jdbcType="VARCHAR" property="userName" />
     <result column="UserMobile" jdbcType="VARCHAR" property="userMobile" />
     <result column="CompanyEmail" jdbcType="VARCHAR" property="companyEmail" />
     <result column="FrName" jdbcType="VARCHAR" property="frName" />
-    <result column="ValidTime" jdbcType="VARCHAR" property="validTime" />
+    <result column="ValidDate" jdbcType="TIMESTAMP" property="validDate" />
+    <result column="IsShortage" jdbcType="INTEGER" property="isShortage" />
     <result column="RecordStatus" jdbcType="INTEGER" property="recordStatus" />
     <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
     <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
     <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
     <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
-    <result column="IsShortage" jdbcType="INTEGER" property="isShortage" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     <result column="BusinScope" jdbcType="LONGVARCHAR" property="businScope" />
@@ -89,9 +89,9 @@
   </sql>
   <sql id="Base_Column_List">
     CompanyID, SiteID, RegionCode, InsuredCount, StreetCode, CompanyName, CompanyCode, 
-    CompanyModel, WorkSituation, CompanyType, Address, UserName, UserMobile, CompanyEmail, 
-    FrName, ValidTime, RecordStatus, CreateUserID, CreateTime, ModifyUserID, ModifyTime, 
-    IsShortage
+    CompanyModel, WorkSituation, CompanyType, CompanyAddress, UserName, UserMobile, CompanyEmail, 
+    FrName, ValidDate, IsShortage, RecordStatus, CreateUserID, CreateTime, ModifyUserID, 
+    ModifyTime
   </sql>
   <sql id="Blob_Column_List">
     BusinScope, CompanyDesc
@@ -148,20 +148,20 @@
     insert into pc_company (CompanyID, SiteID, RegionCode, 
       InsuredCount, StreetCode, CompanyName, 
       CompanyCode, CompanyModel, WorkSituation, 
-      CompanyType, Address, UserName, 
+      CompanyType, CompanyAddress, UserName, 
       UserMobile, CompanyEmail, FrName, 
-      ValidTime, RecordStatus, CreateUserID, 
-      CreateTime, ModifyUserID, ModifyTime, 
-      IsShortage, BusinScope, CompanyDesc
+      ValidDate, IsShortage, RecordStatus, 
+      CreateUserID, CreateTime, ModifyUserID, 
+      ModifyTime, BusinScope, CompanyDesc
       )
     values (#{companyID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR}, 
       #{insuredCount,jdbcType=INTEGER}, #{streetCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
       #{companyCode,jdbcType=VARCHAR}, #{companyModel,jdbcType=INTEGER}, #{workSituation,jdbcType=VARCHAR}, 
-      #{companyType,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
+      #{companyType,jdbcType=VARCHAR}, #{companyAddress,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
       #{userMobile,jdbcType=VARCHAR}, #{companyEmail,jdbcType=VARCHAR}, #{frName,jdbcType=VARCHAR}, 
-      #{validTime,jdbcType=VARCHAR}, #{recordStatus,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
-      #{isShortage,jdbcType=INTEGER}, #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR}
+      #{validDate,jdbcType=TIMESTAMP}, #{isShortage,jdbcType=INTEGER}, #{recordStatus,jdbcType=INTEGER}, 
+      #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, 
+      #{modifyTime,jdbcType=TIMESTAMP}, #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
@@ -197,8 +197,8 @@
       <if test="companyType != null">
         CompanyType,
       </if>
-      <if test="address != null">
-        Address,
+      <if test="companyAddress != null">
+        CompanyAddress,
       </if>
       <if test="userName != null">
         UserName,
@@ -212,8 +212,11 @@
       <if test="frName != null">
         FrName,
       </if>
-      <if test="validTime != null">
-        ValidTime,
+      <if test="validDate != null">
+        ValidDate,
+      </if>
+      <if test="isShortage != null">
+        IsShortage,
       </if>
       <if test="recordStatus != null">
         RecordStatus,
@@ -230,9 +233,6 @@
       <if test="modifyTime != null">
         ModifyTime,
       </if>
-      <if test="isShortage != null">
-        IsShortage,
-      </if>
       <if test="businScope != null">
         BusinScope,
       </if>
@@ -271,8 +271,8 @@
       <if test="companyType != null">
         #{companyType,jdbcType=VARCHAR},
       </if>
-      <if test="address != null">
-        #{address,jdbcType=VARCHAR},
+      <if test="companyAddress != null">
+        #{companyAddress,jdbcType=VARCHAR},
       </if>
       <if test="userName != null">
         #{userName,jdbcType=VARCHAR},
@@ -286,8 +286,11 @@
       <if test="frName != null">
         #{frName,jdbcType=VARCHAR},
       </if>
-      <if test="validTime != null">
-        #{validTime,jdbcType=VARCHAR},
+      <if test="validDate != null">
+        #{validDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isShortage != null">
+        #{isShortage,jdbcType=INTEGER},
       </if>
       <if test="recordStatus != null">
         #{recordStatus,jdbcType=INTEGER},
@@ -304,9 +307,6 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="isShortage != null">
-        #{isShortage,jdbcType=INTEGER},
-      </if>
       <if test="businScope != null">
         #{businScope,jdbcType=LONGVARCHAR},
       </if>
@@ -354,8 +354,8 @@
       <if test="row.companyType != null">
         CompanyType = #{row.companyType,jdbcType=VARCHAR},
       </if>
-      <if test="row.address != null">
-        Address = #{row.address,jdbcType=VARCHAR},
+      <if test="row.companyAddress != null">
+        CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
       </if>
       <if test="row.userName != null">
         UserName = #{row.userName,jdbcType=VARCHAR},
@@ -369,8 +369,11 @@
       <if test="row.frName != null">
         FrName = #{row.frName,jdbcType=VARCHAR},
       </if>
-      <if test="row.validTime != null">
-        ValidTime = #{row.validTime,jdbcType=VARCHAR},
+      <if test="row.validDate != null">
+        ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="row.isShortage != null">
+        IsShortage = #{row.isShortage,jdbcType=INTEGER},
       </if>
       <if test="row.recordStatus != null">
         RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
@@ -387,9 +390,6 @@
       <if test="row.modifyTime != null">
         ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="row.isShortage != null">
-        IsShortage = #{row.isShortage,jdbcType=INTEGER},
-      </if>
       <if test="row.businScope != null">
         BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
       </if>
@@ -413,18 +413,18 @@
       CompanyModel = #{row.companyModel,jdbcType=INTEGER},
       WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
       CompanyType = #{row.companyType,jdbcType=VARCHAR},
-      Address = #{row.address,jdbcType=VARCHAR},
+      CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
       UserName = #{row.userName,jdbcType=VARCHAR},
       UserMobile = #{row.userMobile,jdbcType=VARCHAR},
       CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
       FrName = #{row.frName,jdbcType=VARCHAR},
-      ValidTime = #{row.validTime,jdbcType=VARCHAR},
+      ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
+      IsShortage = #{row.isShortage,jdbcType=INTEGER},
       RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      IsShortage = #{row.isShortage,jdbcType=INTEGER},
       BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
       CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR}
     <if test="example != null">
@@ -443,18 +443,18 @@
       CompanyModel = #{row.companyModel,jdbcType=INTEGER},
       WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
       CompanyType = #{row.companyType,jdbcType=VARCHAR},
-      Address = #{row.address,jdbcType=VARCHAR},
+      CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
       UserName = #{row.userName,jdbcType=VARCHAR},
       UserMobile = #{row.userMobile,jdbcType=VARCHAR},
       CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
       FrName = #{row.frName,jdbcType=VARCHAR},
-      ValidTime = #{row.validTime,jdbcType=VARCHAR},
+      ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
+      IsShortage = #{row.isShortage,jdbcType=INTEGER},
       RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      IsShortage = #{row.isShortage,jdbcType=INTEGER}
+      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -489,8 +489,8 @@
       <if test="companyType != null">
         CompanyType = #{companyType,jdbcType=VARCHAR},
       </if>
-      <if test="address != null">
-        Address = #{address,jdbcType=VARCHAR},
+      <if test="companyAddress != null">
+        CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
       </if>
       <if test="userName != null">
         UserName = #{userName,jdbcType=VARCHAR},
@@ -504,8 +504,11 @@
       <if test="frName != null">
         FrName = #{frName,jdbcType=VARCHAR},
       </if>
-      <if test="validTime != null">
-        ValidTime = #{validTime,jdbcType=VARCHAR},
+      <if test="validDate != null">
+        ValidDate = #{validDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isShortage != null">
+        IsShortage = #{isShortage,jdbcType=INTEGER},
       </if>
       <if test="recordStatus != null">
         RecordStatus = #{recordStatus,jdbcType=INTEGER},
@@ -522,9 +525,6 @@
       <if test="modifyTime != null">
         ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="isShortage != null">
-        IsShortage = #{isShortage,jdbcType=INTEGER},
-      </if>
       <if test="businScope != null">
         BusinScope = #{businScope,jdbcType=LONGVARCHAR},
       </if>
@@ -545,18 +545,18 @@
       CompanyModel = #{companyModel,jdbcType=INTEGER},
       WorkSituation = #{workSituation,jdbcType=VARCHAR},
       CompanyType = #{companyType,jdbcType=VARCHAR},
-      Address = #{address,jdbcType=VARCHAR},
+      CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
       UserName = #{userName,jdbcType=VARCHAR},
       UserMobile = #{userMobile,jdbcType=VARCHAR},
       CompanyEmail = #{companyEmail,jdbcType=VARCHAR},
       FrName = #{frName,jdbcType=VARCHAR},
-      ValidTime = #{validTime,jdbcType=VARCHAR},
+      ValidDate = #{validDate,jdbcType=TIMESTAMP},
+      IsShortage = #{isShortage,jdbcType=INTEGER},
       RecordStatus = #{recordStatus,jdbcType=INTEGER},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      IsShortage = #{isShortage,jdbcType=INTEGER},
       BusinScope = #{businScope,jdbcType=LONGVARCHAR},
       CompanyDesc = #{companyDesc,jdbcType=LONGVARCHAR}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
@@ -572,18 +572,18 @@
       CompanyModel = #{companyModel,jdbcType=INTEGER},
       WorkSituation = #{workSituation,jdbcType=VARCHAR},
       CompanyType = #{companyType,jdbcType=VARCHAR},
-      Address = #{address,jdbcType=VARCHAR},
+      CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
       UserName = #{userName,jdbcType=VARCHAR},
       UserMobile = #{userMobile,jdbcType=VARCHAR},
       CompanyEmail = #{companyEmail,jdbcType=VARCHAR},
       FrName = #{frName,jdbcType=VARCHAR},
-      ValidTime = #{validTime,jdbcType=VARCHAR},
+      ValidDate = #{validDate,jdbcType=TIMESTAMP},
+      IsShortage = #{isShortage,jdbcType=INTEGER},
       RecordStatus = #{recordStatus,jdbcType=INTEGER},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      IsShortage = #{isShortage,jdbcType=INTEGER}
+      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/PcInstitutionMapper.xml

@@ -11,6 +11,7 @@
     <result column="FrMobile" jdbcType="VARCHAR" property="frMobile" />
     <result column="CompanyCode" jdbcType="VARCHAR" property="companyCode" />
     <result column="CompanyDesc" jdbcType="VARCHAR" property="companyDesc" />
+    <result column="Remaark" jdbcType="VARCHAR" property="remaark" />
     <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
     <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
     <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
@@ -76,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     InstitutionID, CompanyName, CompanyAddress, FzrName, FzrMobile, FrName, FrMobile, 
-    CompanyCode, CompanyDesc, CreateUserID, CreateTime, ModifyUserID, ModifyTime
+    CompanyCode, CompanyDesc, Remaark, CreateUserID, CreateTime, ModifyUserID, ModifyTime
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcInstitutionExample" resultMap="BaseResultMap">
     select
@@ -112,13 +113,13 @@
     insert into pc_institution (InstitutionID, CompanyName, CompanyAddress, 
       FzrName, FzrMobile, FrName, 
       FrMobile, CompanyCode, CompanyDesc, 
-      CreateUserID, CreateTime, ModifyUserID, 
-      ModifyTime)
+      Remaark, CreateUserID, CreateTime, 
+      ModifyUserID, ModifyTime)
     values (#{institutionID,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{companyAddress,jdbcType=VARCHAR}, 
       #{fzrName,jdbcType=VARCHAR}, #{fzrMobile,jdbcType=VARCHAR}, #{frName,jdbcType=VARCHAR}, 
       #{frMobile,jdbcType=VARCHAR}, #{companyCode,jdbcType=VARCHAR}, #{companyDesc,jdbcType=VARCHAR}, 
-      #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, 
-      #{modifyTime,jdbcType=TIMESTAMP})
+      #{remaark,jdbcType=VARCHAR}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcInstitution">
     insert into pc_institution
@@ -150,6 +151,9 @@
       <if test="companyDesc != null">
         CompanyDesc,
       </if>
+      <if test="remaark != null">
+        Remaark,
+      </if>
       <if test="createUserID != null">
         CreateUserID,
       </if>
@@ -191,6 +195,9 @@
       <if test="companyDesc != null">
         #{companyDesc,jdbcType=VARCHAR},
       </if>
+      <if test="remaark != null">
+        #{remaark,jdbcType=VARCHAR},
+      </if>
       <if test="createUserID != null">
         #{createUserID,jdbcType=VARCHAR},
       </if>
@@ -241,6 +248,9 @@
       <if test="row.companyDesc != null">
         CompanyDesc = #{row.companyDesc,jdbcType=VARCHAR},
       </if>
+      <if test="row.remaark != null">
+        Remaark = #{row.remaark,jdbcType=VARCHAR},
+      </if>
       <if test="row.createUserID != null">
         CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       </if>
@@ -269,6 +279,7 @@
       FrMobile = #{row.frMobile,jdbcType=VARCHAR},
       CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
       CompanyDesc = #{row.companyDesc,jdbcType=VARCHAR},
+      Remaark = #{row.remaark,jdbcType=VARCHAR},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
@@ -304,6 +315,9 @@
       <if test="companyDesc != null">
         CompanyDesc = #{companyDesc,jdbcType=VARCHAR},
       </if>
+      <if test="remaark != null">
+        Remaark = #{remaark,jdbcType=VARCHAR},
+      </if>
       <if test="createUserID != null">
         CreateUserID = #{createUserID,jdbcType=VARCHAR},
       </if>
@@ -329,6 +343,7 @@
       FrMobile = #{frMobile,jdbcType=VARCHAR},
       CompanyCode = #{companyCode,jdbcType=VARCHAR},
       CompanyDesc = #{companyDesc,jdbcType=VARCHAR},
+      Remaark = #{remaark,jdbcType=VARCHAR},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},

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

@@ -31,7 +31,7 @@
         <if test="streetCode!='' and regionCode!=null">
             and streetCode like Concat('%',#{streetCode},'%')
         </if>
-        order by postCount desc,company.ModifyTime desc
+        order by company.CreateTime desc,postCount desc
     </select>
 
 </mapper>

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

@@ -6,6 +6,7 @@
         <if test="jobUserID != null and jobUserID != ''">
             and jobUserID = #{jobUserID}
         </if>
+        order by CreateTime desc
     </select>
     <select id="getById" resultType="com.hz.employmentsite.model.PcEducation">
         select * from pc_education where 1=1

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

@@ -48,5 +48,6 @@
        <!-- <if test="isAccomplish != '' and isAccomplish != null">
             and isAccomplish = #{isAccomplish}
         </if>-->
+        order by jobHunt.CreateTime desc
     </select>
 </mapper>

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

@@ -31,5 +31,6 @@
         <if test="emphasisTypeId != null and emphasisTypeId != ''">
             and jobuser.KeyPersonTypeID = #{emphasisTypeId}
         </if>
+        order by jobuser.CreateTime desc
     </select>
 </mapper>