Merge remote-tracking branch 'origin/master'

h5app/src/views/pages/work/log/list.vue

@@ -231,16 +231,8 @@ export default defineComponent({
     }
 
     const reload = () => {
-      // 设置查询初始截止日期为当天
-      const firstDay = new Date();
-      // 设置查询初始开始时间为当天的一个月前
-      const lastDay = new Date();
-      lastDay.setDate(firstDay.getDate() - 30);
-
       dataList.value = [];
       searchParamsState.pageIndex = 1;
-      searchParamsState.workStartDate=dayjs(lastDay.toLocaleDateString()).format('YYYY-MM-DD');
-      searchParamsState.workEndDate = dayjs(firstDay.toLocaleDateString()).format('YYYY-MM-DD');
       loadData();
     }
 
@@ -272,9 +264,16 @@ export default defineComponent({
       reload();
     });
 
-    // onMounted(() => {
-    //   reload();
-    // })
+    // 页面初始化设置值，防止onIonViewDidEnter时没有查询时间
+    onMounted(() => {
+      // 设置查询初始截止日期为当天
+      const firstDay = new Date();
+      // 设置查询初始开始时间为当天的一个月前
+      const lastDay = new Date();
+      lastDay.setDate(firstDay.getDate() - 30);
+      searchParamsState.workStartDate = dayjs(lastDay.toLocaleDateString()).format('YYYY-MM-DD') + "T00:00:00.000+08:00";
+      searchParamsState.workEndDate = dayjs(firstDay.toLocaleDateString()).format('YYYY-MM-DD') + "T00:00:00.000+08:00";
+    })
 
     return {
       router,

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

@@ -17,6 +17,7 @@ public class PostVo {
 
     @SiteID
     private String siteID;
+    private String siteName;
 
     @InstitutionID
     public String institutionID;

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

@@ -28,6 +28,7 @@ public class RecommendMgtVo extends PcRecommendMgt {
     // 数据权限
     @SiteID
     private String siteID;
+    private String siteName;
     @InstitutionID
     public String institutionID;
     @RegionID

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

@@ -11,10 +11,11 @@
         company.CompanyName,company.insuredCount,company.bonus,item.`Name` as cultureLevelName,work_nature.Name as
         workNatureName,
         post.ProfessionID,pro.ProfessionName,pro.parentProfessionID,
-        company.CompanyName,company.insuredCount,company.bonus,item.`Name` as cultureLevelName,work_nature.Name as workNatureName,
+        company.CompanyName,company.insuredCount,company.bonus,item.`Name` as cultureLevelName,work_nature.Name as
+        workNatureName,
         post.ProfessionID,pro.ProfessionName,pro.parentProfessionID,item2.`Name` as workYearStr
         , IFNULL(count(rmgt.RecommendMgtID),0) as recommendNum
-        , site.SiteID as siteID,inSites.InstitutionID as institutionID, company.RegionCode as regionCode
+        , site.SiteID, site.SiteName, inSites.InstitutionID as institutionID, company.RegionCode
         from pc_post post
         left join pc_company company on post.CompanyID = company.CompanyID
         left join sys_dictionary_item item on item.value=post.CultureRank and item.DictionaryCode='CultureLevel'

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

@@ -10,7 +10,7 @@
         dic4.`name` as jobpeopleisreadname,g.`name` as pushname, dic5.`name` as gendername
         ,e.jobuserId,c.companyId
         ,d.workYear
-        ,site.SiteID as siteID,inSites.InstitutionID as institutionID,site.RegionCode as regionCode
+        ,site.SiteID, site.SiteName,inSites.InstitutionID as institutionID,site.RegionCode
         from pc_recommend_mgt a
         inner join pc_post b on a.PostID = b.PostID
         left join pc_company c on b.CompanyID = c.CompanyID
@@ -29,7 +29,7 @@
         left join (select `Value`,`Name` from sys_dictionary_item where DictionaryCode='Gender') dic5 on e.Sex =
         dic5.`Value`
         left join sys_user g on a.CreateUserID = g.UserID
-        left join pc_site site on site.SiteID = e.SiteID
+        left join pc_site site on e.SiteID = site.SiteID
         left join pc_site_institution inSites on site.SiteID = inSites.SiteID
         left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         <where>

vue/src/views/baseSettings/institution/index.vue

@@ -34,7 +34,8 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" functioncode="T01010102" @click='onAdd' >新增</a-button>
-          <BExportExcel :title="'导出'"   :filename="'运营机构信息'" :url="'institution/export'" :params="{...searchParams, rows:100000,institutionIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'运营机构信息'" :url="'institution/export'"
+                        :params="{...exportSearchParams, rows:100000,institutionIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -83,6 +84,12 @@ export default defineComponent({
       companyAddress: '',
       dutyUserName:''
     });
+    // 导出Excel查询参数
+    const exportSearchParams = computed(() => {
+      let data = JSON.parse(JSON.stringify(searchParams));
+      data.pageSize = formState.total;
+      return data;
+    })
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -190,7 +197,8 @@ export default defineComponent({
       onEdit,
       onDel,
       loadData,
-      onDetail
+      onDetail,
+      exportSearchParams
     };
   },
   created() {

vue/src/views/baseSettings/siteInfo/index.vue

@@ -80,7 +80,8 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit"  functioncode="T01010202" @click='onAdd' >新增</a-button>
-          <BExportExcel :title="'导出'" :filename="'驿站站点信息'" :url="'siteInfo/export'" :params="{...searchParams, rows:100000,siteIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'驿站站点信息'" :url="'siteInfo/export'"
+                        :params="{...exportSearchParams, rows:100000,siteIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -134,6 +135,12 @@ export default defineComponent({
       regionCode:'',
       streetCode:'',
     });
+    // 导出Excel查询参数
+    const exportSearchParams = computed(() => {
+      let data = JSON.parse(JSON.stringify(searchParams));
+      data.pageSize = formState.total;
+      return data;
+    })
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -270,7 +277,8 @@ export default defineComponent({
       onDel,
       loadData,
       changeRegion,
-      onDetail
+      onDetail,
+      exportSearchParams
     };
   },
   created() {

vue/src/views/baseSettings/siteUser/index.vue

@@ -45,7 +45,8 @@
                         :options="importOptions"
                         @success="loadData"
           ></BImportExcel>
-          <BExportExcel :title="'导出'" :filename="'驿站人员信息'" :url="'userInfo/export'" :params="{...searchParams, rows:100000,siteUserIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'驿站人员信息'" :url="'userInfo/export'"
+                        :params="{...exportSearchParams, rows:100000,siteUserIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -98,6 +99,12 @@ export default defineComponent({
       siteID: '',
       userNo: ""
     });
+    // 导出Excel查询参数
+    const exportSearchParams = computed(() => {
+      let data = JSON.parse(JSON.stringify(searchParams));
+      data.pageSize = formState.total;
+      return data;
+    })
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -233,7 +240,7 @@ export default defineComponent({
     };
 
     const onEdit = (id: string) => {
-      tabsViewStore.addTabByPath('/baseSettings/user/edit', {id:id,op:2});
+      tabsViewStore.addTabByPath('/baseSettings/user/edit', {id: id, op: 1});
     };
 
     const onDetail = (id: string) => {
@@ -256,7 +263,8 @@ export default defineComponent({
       onDel,
       loadData,
       onDetail,
-      importOptions
+      importOptions,
+      exportSearchParams
     };
   },
   created() {

vue/src/views/companyService/company/edit.vue

@@ -339,7 +339,8 @@
             name="insuredCount"
             :rules="[{ required: false, message: '请输入参保人数!' }]"
           >
-            <a-input v-model:value="dataModel.insuredCount" placeholder=""/>
+            <a-input-number :min="0" style="width: 100%" :controls="false" v-model:value="dataModel.insuredCount"
+                            placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>

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

@@ -87,7 +87,7 @@
           ></BImportExcel>
           <BExportExcel :title="'导出'" :filename="'企业信息'"
                         :url="'companyService/company/export'"
-                        :params="{...searchParams, isExport: true, rows:10000,companyIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+                        :params="{...exportSearchParams, isExport: true, rows:10000,companyIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -148,6 +148,12 @@ export default defineComponent({
       regionCode: '',
       streetCode: ''
     });
+    // 导出Excel查询参数
+    const exportSearchParams = computed(() => {
+      let data = JSON.parse(JSON.stringify(searchParams));
+      data.pageSize = formState.total;
+      return data;
+    })
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -329,7 +335,8 @@ export default defineComponent({
       recordStatusList,
       regionList,
       streetList,
-      onDetail
+      onDetail,
+      exportSearchParams
     };
   },
   created() {

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

@@ -76,7 +76,7 @@
           ></BImportExcel>
           <BExportExcel :title="'导出'" :filename="'岗位信息'"
                         :url="'companyService/post/export'"
-                        :params="{...searchParams, isExport: true, rows:10000,postIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+                        :params="{...exportSearchParams, isExport: true, rows:10000,postIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -136,6 +136,12 @@ export default defineComponent({
       professionName: null,
       recordStatus: null
     });
+    // 导出Excel查询参数
+    const exportSearchParams = computed(() => {
+      let data = JSON.parse(JSON.stringify(searchParams));
+      data.pageSize = formState.total;
+      return data;
+    })
     const expand = ref(false);
     const companyList = ref<SelectProps['options']>();
     const postStatusList = [{name: '启用', value: 1}, {name: '禁用', value: 0}];
@@ -198,15 +204,15 @@ export default defineComponent({
         }
       },
       // {title: '工种名称', dataIndex: 'workName', key: 'workName', align: "center"},
-      {title: '文化程度', dataIndex: 'cultureLevelName', key: 'cultureLevelName', width: 150, align: "center"},
+      {title: '学历要求', dataIndex: 'cultureLevelName', key: 'cultureLevelName', width: 150, align: "center"},
       {
         title: '薪酬', dataIndex: 'postSalary', key: 'postSalary', align: "center", customRender: (item) => {
           const salary = showSalary(item.record.minSalary,item.record.maxSalary);/*`${item.record.minSalary ?? ""}-${item.record.maxSalary ?? ""}`*/
           return salary;
         }
       },
-      {title: '联系人', dataIndex: 'userName', key: 'userName', align: "center"},
-      {title: '联系电话', dataIndex: 'userMobile', key: 'userMobile', width: 200, align: "center"},
+      {title: '联系人', dataIndex: 'contactName', key: 'contactName', align: "center"},
+      {title: '联系电话', dataIndex: 'contactMobile', key: 'contactMobile', width: 200, align: "center"},
       {title: '推荐数量', dataIndex: 'recommendNum',key: 'recommendNum',width: 100, align: "center"},
       {title: '操作', key: 'operation', fixed: 'right', width: 240, align: "center"},
     ];
@@ -327,7 +333,8 @@ export default defineComponent({
       expand,
       postStatusList,
       companyList,
-      onDetail
+      onDetail,
+      exportSearchParams
     };
   },
   created() {

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

@@ -19,9 +19,11 @@
         </a-col>
         <a-col :span="8">
           <a-form-item label="工作年限" :label-col="{ span: 6 }" name="workYear">
-            <a-input type="number" v-model:value="searchParamsState.minWorkYear" style="width:110px;" placeholder=""/>
+            <a-input-number :min="0" :controls="false" v-model:value="searchParamsState.minWorkYear"
+                            style="width:110px;" placeholder=""/>
             <label style="margin:10px;">-</label>
-            <a-input type="number" v-model:value="searchParamsState.maxWorkYear" style="width:110px;" placeholder=""/>
+            <a-input-number :min="searchParamsState.minWorkYear" :controls="false"
+                            v-model:value="searchParamsState.maxWorkYear" style="width:110px;" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="4" style="text-align: left">
@@ -76,9 +78,12 @@
         </a-col>
         <a-col :span="8">
           <a-form-item label="月薪要求" :label-col="{ span: 6 }" name="salary">
-            <a-input type="number" v-model:value="searchParamsState.minSalary" style="width:110px;" placeholder=""/>
+            <a-input-number style="width: 110px" :controls="false" :min="0" v-model:value="searchParamsState.minSalary"
+                            placeholder=""/>
             <label style="margin:10px;">-</label>
-            <a-input type="number" v-model:value="searchParamsState.maxSalary" style="width:110px;" placeholder=""/>
+            <a-input-number style="width: 110px" :controls="false" :min="searchParamsState.minSalary"
+                            v-model:value="searchParamsState.maxSalary"
+                            placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="4" style="text-align: left"></a-col>
@@ -108,7 +113,7 @@
                         @success="loadData"
           ></BImportExcel>
           <BExportExcel :title="'导出'" :filename="'求职意向信息'" :url="'/jobUserService/jobHunt/export'"
-                        :params="{...searchParamsState, rows:100000,jobHuntIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+                        :params="{...exportSearchParams, rows:100000,jobHuntIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -177,6 +182,12 @@ export default defineComponent({
       maxSalary: null,
       isAccomplish: null
     });
+    // 导出Excel查询参数
+    const exportSearchParams = computed(() => {
+      let data = JSON.parse(JSON.stringify(searchParamsState));
+      data.pageSize = formState.total;
+      return data;
+    })
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -371,6 +382,7 @@ export default defineComponent({
       jobUserTypeList,
       isAccomplishList,
       recommendRef,
+      exportSearchParams,
       showSalary,
       loadData,
       onSearch,

vue/src/views/jobUserManager/jobuser/index.vue

@@ -105,7 +105,7 @@
           <a-button type="primary" html-type="submit" @click='onAdd' functioncode="T01030102">新增</a-button>
           <BExportExcel :title="'导出'" :filename="'求职人员信息'"
                         :url="'jobUserService/jobUser/export'"
-                        :params="{...searchParamsState, isExport: true, rows:10000,jobUserIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+                        :params="{...exportSearchParams, isExport: true, rows:10000,jobUserIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -165,6 +165,12 @@ export default defineComponent({
       educationTypeId: null,
       emphasisTypeId: null
     });
+    // 导出Excel查询参数
+    const exportSearchParams = computed(() => {
+      let data = JSON.parse(JSON.stringify(searchParamsState));
+      data.pageSize = formState.total;
+      return data;
+    })
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -276,7 +282,7 @@ export default defineComponent({
     };
 
     const getEducationList = () => {
-      getSysDictionaryList('CultureLevel').then((data) => {
+      getSysDictionaryList('HighestDegree').then((data) => {
         educationTypeList.value = data;
       });
     };
@@ -352,7 +358,8 @@ export default defineComponent({
       getEmphasisTypeList,
       calculateAge,
       onVitae,
-      expand
+      expand,
+      exportSearchParams
     };
   },
   created() {

vue/src/views/taskAndLog/dotask/index.vue

@@ -78,7 +78,7 @@
         <a-col :span="24" style="text-align: right">
           <a-button functioncode="T01040102" html-type="submit" type="primary" @click='onAdd'>新增</a-button>
           <BExportExcel :filename="'任务信息'"
-                        :params="{...searchParams, isExport: true, rows:10000,doTaskIDList:formState.selectedRowKeys.join(',')}"
+                        :params="{...exportSearchParams, isExport: true, rows:10000,doTaskIDList:formState.selectedRowKeys.join(',')}"
                         :title="'导出'"
                         :url="'taskAndLog/doTask/export'"></BExportExcel>
         </a-col>
@@ -135,6 +135,12 @@ export default defineComponent({
       regionCode: '',
       streetCode: ''
     });
+    // 导出Excel查询参数
+    const exportSearchParams = computed(() => {
+      let data = JSON.parse(JSON.stringify(searchParams));
+      data.pageSize = formState.total;
+      return data;
+    })
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -314,7 +320,8 @@ export default defineComponent({
       onAdd,
       onEdit,
       dayjs,
-      onDetail
+      onDetail,
+      exportSearchParams
     };
   },
   created() {

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

@@ -66,7 +66,9 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button functioncode="T01040202" html-type="submit" type="primary" @click='onAdd'>新增</a-button>
-          <BExportExcel :filename="'工作日志信息'" :params="{...searchParams, rows:100000,doWorkIDList:formState.selectedRowKeys.join(',')}" :title="'导出'"
+          <BExportExcel :filename="'工作日志信息'"
+                        :params="{...exportSearchParams, rows:100000,doWorkIDList:formState.selectedRowKeys.join(',')}"
+                        :title="'导出'"
                         :url="'taskAndLog/doWork/export'"></BExportExcel>
         </a-col>
       </a-row>
@@ -148,6 +150,12 @@ export default defineComponent({
       regionCode: '',
       streetCode: ''
     });
+    // 导出Excel查询参数
+    const exportSearchParams = computed(() => {
+      let data = JSON.parse(JSON.stringify(searchParams));
+      data.pageSize = formState.total;
+      return data;
+    })
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -340,6 +348,7 @@ export default defineComponent({
       onRecordsJobUserInfo,
       companyTableComRef,
       jobUserTableComRef,
+      exportSearchParams
     };
   },
   created() {