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

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/views/pages/company/editPost.vue

@@ -290,12 +290,6 @@ export default defineComponent({
       await alert.present();
     }
 
-
-    const onSetProfessionID = (data: any)=>{
-      formState.dataModel.professionID = data.value;
-      formState.dataModel.professionName = data.text;
-    }
-
     const onSetWorkCategoryID = (data: any)=>{
       formState.dataModel.workCode = data.value;
       formState.dataModel.workCategoryName = data.text;
@@ -489,7 +483,6 @@ export default defineComponent({
       recruitCountBlur,
       onIsTrailChange,
       onSetWorkCategoryID,
-      onSetProfessionID,
       onSave,
       back,
     }

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/jobHuntEdit.vue

@@ -240,11 +240,6 @@ export default defineComponent({
       const result :any = await get('system/area/getCityList',{});
       workAreaList.value = result;
     }
-
-    const onSetProfessionID = (data: any)=>{
-      jobHuntData.dataModel.professionID = data.value;
-      jobHuntData.dataModel.professionName = data.text;
-    }
     const ifInputAllValid = ()=>{
       let errorMessage = "";
       let hasMinSalary = false;
@@ -350,7 +345,6 @@ export default defineComponent({
       workYearTypeList,
       workAreaList,
       setOpen,
-      onSetProfessionID,
       onSave,
       onCancel,
       loadData,

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

@@ -293,10 +293,6 @@ export default defineComponent({
       });
       await alert.present();
     }
-    const onSetProfessionID = (data: any)=>{
-      formState.dataModel.professionID = data.value;
-      formState.dataModel.professionName = data.text;
-    }
 
     const onSetWorkCategoryID = (data: any)=>{
       formState.dataModel.workCode = data.value;
@@ -481,7 +477,6 @@ export default defineComponent({
       onResultInfo,
       recruitCountBlur,
       onSetWorkCategoryID,
-      onSetProfessionID,
       onSave,
       back,
     }

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

@@ -244,11 +244,6 @@ export default defineComponent({
       workAreaList.value = result;
     }
 
-    const onSetProfessionID = (data: any)=>{
-      jobHuntData.dataModel.professionID = data.value;
-      jobHuntData.dataModel.professionName = data.text;
-    }
-
     const ifInputAllValid = ()=>{
       let errorMessage = "";
       let hasMinSalary = false;
@@ -352,7 +347,6 @@ export default defineComponent({
       workYearTypeList,
       workAreaList,
       setOpen,
-      onSetProfessionID,
       onSave,
       onCancel,
       loadData,

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>

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/services/impl/companyService/PostServiceImpl.java

@@ -138,7 +138,7 @@ public class PostServiceImpl implements PostService {
         }
 
         //判断岗位id是否为空
-        if (stringUtils.IsNullOrEmpty(data.professionID)) {
+        if (stringUtils.IsNullOrEmpty(data.getProfessionID())) {
             PcProfessionExample proEmp = new PcProfessionExample();
             PcProfessionExample.Criteria proCia = proEmp.or();
             proCia.andParentProfessionIDNotEqualTo("");

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobHuntServiceImpl.java

@@ -17,6 +17,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Service("JobHuntService")
@@ -116,6 +117,40 @@ public class JobHuntServiceImpl implements JobHuntService {
         JobHuntVo record = get(data.jobHuntID);
         PcJobhunt dbData = record == null ? null : pcJobhuntMapper.selectByPrimaryKey(record.jobHuntID);
         Boolean isExist = dbData != null;
+
+        //判断岗位id是否为空
+        if (stringUtils.IsNullOrEmpty(data.getProfessionID())) {
+            PcProfessionExample proEmp = new PcProfessionExample();
+            PcProfessionExample.Criteria proCia = proEmp.or();
+            proCia.andParentProfessionIDNotEqualTo("");
+            proCia.andProfessionNameEqualTo("其他");
+            //获取二级其他信息
+            PcProfession proOther = pcProfessionMapper.selectByExample(proEmp).stream().findFirst().orElse(null);
+            if (proOther != null) {
+                proEmp = new PcProfessionExample();
+                proEmp.or().andParentProfessionIDEqualTo(proOther.getProfessionID());
+//                proCia.andProfessionNameEqualTo(data.getProfessionName());
+
+                //查询其他岗位
+                List<PcProfession> proOtherSonList = pcProfessionMapper.selectByExample(proEmp);
+                PcProfession proOtherSon = proOtherSonList.stream()
+                        .filter(x -> x.getProfessionName().equals(data.getProfessionName())).findFirst().orElse(null);
+                if (proOtherSon != null) {
+                    data.setProfessionID(proOtherSon.getProfessionID());
+                } else {
+                    data.setProfessionID(UUID.randomUUID().toString());
+                    PcProfession proModel = new PcProfession();
+                    proModel.setProfessionID(data.getProfessionID());
+                    proModel.setParentProfessionID(proOther.getProfessionID());
+                    proModel.setProfessionName(data.getProfessionName());
+                    proModel.setStatus(Integer.parseInt("1"));
+                    proModel.setOrderNo(proOtherSonList.size() + 1);
+
+                    pcProfessionMapper.insert(proModel);
+                }
+            }
+        }
+
         if (!isExist) {
             //添加
             dbData = new PcJobhunt();

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,