Merge remote-tracking branch 'origin/master'

h5app/src/components/bImage.vue

@@ -175,7 +175,7 @@ export default defineComponent({
     padding: 0 5px;
 
     img {
-      height: 73px;
+      height: 100%;
       object-fit: cover;
       border-radius: 10px;
       width: 100%;

h5app/src/components/postSelectionLike.vue

@@ -103,8 +103,10 @@ export default defineComponent({
     }
 
     const onConfirm = () => {
-      resultInfo.text = searchParams.professionName;
-      context.emit("resultInfo", resultInfo);
+      if(searchParams.professionName){
+        resultInfo.text = searchParams.professionName;
+        context.emit("resultInfo", resultInfo);
+      }
       onOpen();
     }
 

h5app/src/router/index.ts

@@ -177,6 +177,10 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: 'tabMain/userQrCode/index',
                 component: () => import('@/views/pages/userQrCode/index.vue')
+            },
+            {
+                path: 'tabWork/userQrCode/index',
+                component: () => import('@/views/pages/userQrCode/index.vue')
             }
         ]
     },

h5app/src/views/pages/jobUserInfo/companyEdit.vue

@@ -323,7 +323,7 @@ export default defineComponent({
       openID:"",
       statusVal: 1
     });
-    const isAdd = ref(false);
+    const isAdd = ref(true);
     const isShow = ref<any>(false);
     const loadingFirm = ref(false);
     // 信息弹窗内容
@@ -586,6 +586,7 @@ export default defineComponent({
     }
 
     const loadData = async (companyID: any,status:any,userID:any,openId:any) => {
+      isAdd.value = companyID == null;
       curStepData.value.statusVal = status;
       curStepData.value.loginUserID = userID;
       curStepData.value.openID = openId;

h5app/src/views/pages/jobUserInfo/index.vue

@@ -171,8 +171,8 @@ export default defineComponent({
   }
 
   .img-item:first-child,.img-item:first-child img{
-    width: 150px;
-    height:150px;
+    width: 120px;
+
   }
 
   .img-item:not(:first-child){

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

@@ -15,17 +15,21 @@
         <div class="bw-vue-form">
           <div class="form-title">基础信息</div>
           <div class="form-select">
-            <ion-label>企业<span class="danger">*</span></ion-label>
-            <ion-item :class="[v$.dataModel.companyID.$error?'ion-invalid':'ion-valid']">
-              <ion-select interface="action-sheet" placeholder="请选择企业" cancel-text="取消"
-                          id="companyID" v-model="dataModel.companyID" style="width: 100%;text-align: left;">
-                <ion-select-option v-for="(record,key) in companyList" :key="key"
-                                   v-model:value="record.companyID">
-                  {{ record.companyName }}
-                </ion-select-option>
-              </ion-select>
-              <ion-note slot="error">请选择企业</ion-note>
+            <ion-label>企业</ion-label>
+            <ion-item>
+              {{dataModel.companyName}}
             </ion-item>
+            <!--            <ion-label>企业<span class="danger">*</span></ion-label>-->
+<!--            <ion-item :class="[v$.dataModel.companyID.$error?'ion-invalid':'ion-valid']">-->
+<!--              <ion-select interface="action-sheet" placeholder="请选择企业" cancel-text="取消"-->
+<!--                          disabled="true" id="companyID" v-model="dataModel.companyID" style="width: 100%;text-align: left;">-->
+<!--                <ion-select-option v-for="(record,key) in companyList" :key="key"-->
+<!--                                   v-model:value="record.companyID">-->
+<!--                  {{ record.companyName }}-->
+<!--                </ion-select-option>-->
+<!--              </ion-select>-->
+<!--              <ion-note slot="error">请选择企业</ion-note>-->
+<!--            </ion-item>-->
           </div>
           <div class="form-input">
             <ion-label>岗位名称<span class="danger">*</span></ion-label>

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

@@ -6,9 +6,9 @@
           <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
         </ion-buttons>
         <ion-title>岗位信息管理</ion-title>
-        <ion-buttons slot="end">
-          <ion-icon @click="onAdd" :icon="addCircleOutline"></ion-icon>
-        </ion-buttons>
+<!--        <ion-buttons slot="end">-->
+<!--          <ion-icon @click="onAdd" :icon="addCircleOutline"></ion-icon>-->
+<!--        </ion-buttons>-->
       </ion-toolbar>
     </ion-header>
     <ion-content>

h5app/src/views/pages/work/track/index.vue

@@ -2,6 +2,9 @@
   <ion-page class="list-page">
     <ion-header class="header-theme2 header-theme3">
       <ion-toolbar>
+        <ion-buttons slot="start">
+          <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
+        </ion-buttons>
         <ion-title>工作轨迹</ion-title>
       </ion-toolbar>
     </ion-header>
@@ -24,6 +27,8 @@ import {getLongitudeLatitudeList} from "../../../../api/position";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {useUserStore} from "../../../../store/modules/user";
 import dayjs from 'dayjs';
+import {arrowBackOutline} from 'ionicons/icons';
+import {useRouter} from "vue-router";
 
 const presentAlert = async (header, message) => {
   const alert = await alertController.create({
@@ -40,6 +45,7 @@ const presentAlert = async (header, message) => {
 export default defineComponent({
   name: 'user_track',
   setup() {
+    const router = useRouter();
     const userStore = useUserStore();
     const user = ref(userStore.getUserInfo);
     const startDate = ref(dayjs(new Date()).format('YYYY-MM-DD'));
@@ -99,6 +105,10 @@ export default defineComponent({
       setLine();
     };
 
+    const onBack = () => {
+      router.push('/tabs/tabWork');
+    }
+
     /*window.onload = initMap;*/
 
     onIonViewDidEnter(() => {
@@ -107,7 +117,9 @@ export default defineComponent({
 
     return {
       startDate,
-      search
+      search,
+      onBack,
+      arrowBackOutline
     }
   }
 });

h5app/src/views/pages/wxMessage/companyInfo.vue

@@ -34,7 +34,7 @@
       </div>
       <div class="user_info_label">
         <ion-label>联系电话</ion-label>
-        <ion-text>{{companyInfo.userMobile}}</ion-text>
+        <ion-text><a :href="'tel://' + companyInfo.userMobile">{{companyInfo.userMobile}}</a></ion-text>
       </div>
     </div>
     <div class="user_panel user_baseinfo">

h5app/src/views/pages/wxMessage/jobUserInfo.vue

@@ -42,7 +42,7 @@
       </div>
       <div class="user_info_label user_info_border">
         <ion-label>电话</ion-label>
-        <ion-text>{{jobUserInfo.userMobile}}</ion-text>
+        <ion-text><a :href="'tel://' + jobUserInfo.userMobile">{{jobUserInfo.userMobile}}</a></ion-text>
       </div>
       <div class="user_info_label">
         <ion-label>邮箱</ion-label>

h5app/src/views/sapp/tabWork.vue

@@ -78,7 +78,7 @@
          <div class="content-title">我的应用</div>
          <div class="content-applist">
            <div class="tool-box">
-             <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/userQrCode/index')">
+             <a class="tool-item box-line"  @click="router.push('/tabs/tabWork/userQrCode/index')">
                <div class="tool-img">
                  <img src="@/assets/icon/qrcode.png">
                </div>

src/main/java/com/hz/employmentsite/config/WebConfiguration.java

@@ -90,6 +90,7 @@ public class WebConfiguration implements WebMvcConfigurer {
         excludePath.add("/api/siteInfo/getDataList");
         excludePath.add("/api/companyService/company/getSiteList");
         excludePath.add("/api/companyService/company/save");
+        excludePath.add("/api/companyService/company/normalFirm"); // 按企业名称匹配企业信息
         excludePath.add("/api/companyService/post/save");
         excludePath.add("/api/jobUserService/education/save");
         excludePath.add("/api/jobUserService/experience/save");

src/main/java/com/hz/employmentsite/util/datarange/DataRangeInterceptor.java

@@ -130,7 +130,7 @@ public class DataRangeInterceptor implements Interceptor {
                         .findFirst().orElse(null);
                 break;
             case SELF:
-                field = Arrays.stream(entityClass.getDeclaredFields()).filter(x -> x.getAnnotationsByType(SiteID.class).length > 0)
+                field = Arrays.stream(entityClass.getDeclaredFields()).filter(x -> x.getAnnotationsByType(UserID.class).length > 0)
                         .findFirst().orElse(null);
                 break;
             default:

src/main/java/com/hz/employmentsite/vo/taskAndLog/DoTaskVo.java

@@ -2,6 +2,7 @@ package com.hz.employmentsite.vo.taskAndLog;
 
 import com.hz.employmentsite.util.datarange.annotations.DoTaskID;
 import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.UserID;
 import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import lombok.Data;
 
@@ -23,15 +24,16 @@ public class DoTaskVo {
     public Date finishTime;
 
     public Date createTime;
-
+    @UserID
+    public String createUserID;
     public String createName;
 
     public int userCount;
 
     public String workTypeName;
-    
+
     public String regionName;
-    
+
     public String streetName;
 
     @RegionID

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.hz.employmentsite.mapper.cquery.DoTaskCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.taskAndLog.DoTaskVo">
-        select task.dotaskID,task.workTypeID,task.content,task.dotaskName,u.`Name` as
+        select task.dotaskID,task.workTypeID,task.content,task.dotaskName,task.CreateUserID as createUserID, u.`Name` as
         createName,task.finishTime,task.createTime,task.modifyTime,
         task.taskStatus,dic_taskStatus.Name as taskStatusName,
         (select count(*) from pc_dotask_user du where du.DotaskID = task.DotaskID group by task.DotaskID)as userCount,