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

h5app/src/App.vue

@@ -376,7 +376,7 @@ ion-grid {
 
     ion-item {
       --inner-border-width: 0;
-      --inner-padding-end: 0px;
+      //--inner-padding-end: 0px;
       margin: 0 10px;
       border-bottom: 1px solid #f1f5f7;
       border-radius: 0px;

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

@@ -129,6 +129,20 @@
               </div>
             </div>
             <div v-if="expand">
+              <div class="form-input">
+                <ion-label>社会保障卡号</ion-label>
+                <ion-input name="socialSecurityCard" id="socialSecurityCard"  style="text-align: left;"  class="custom" :clear-input="true"
+                         placeholder="请输入社会保障卡号" v-model="baseData.socialSecurityCard" ></ion-input>
+              </div>
+              <div class="form-select">
+                <ion-label>政治面貌</ion-label>
+                <ion-select name="politicsStatusID"  id="politicsStatusID" okText="确定" cancelText="取消" v-model="baseData.politicsStatusID"
+                            interface="action-sheet" placeholder="请选择政治面貌" style="width:100%;text-align:left;" >
+                  <ion-select-option v-for=" (it,key) in politicsStatusList" :key="key" :value="it.value">
+                    {{ it.name }}
+                  </ion-select-option>
+                </ion-select>
+              </div>
               <div class="form-select">
                 <ion-label>民族</ion-label>
                 <ion-select name="nationID"  id="nationID" okText="确定" cancelText="取消" v-model="baseData.nation"
@@ -140,31 +154,66 @@
                 <!--            <ion-input name="nation" id="nation"  style="text-align: left;" class="custom"  :clear-input="true"
                                        v-model="baseData.nation" placeholder="请输入民族" ></ion-input>-->
               </div>
+
+              <div class="form-input">
+                <ion-label>毕业院校</ion-label>
+                <ion-input name="finishSchool" id="finishSchool"  style="text-align: left;"  class="custom" :clear-input="true"
+                           placeholder="请输入毕业院校" v-model="baseData.finishSchool" ></ion-input>
+              </div>
+              <div class="form-input">
+                <ion-label>专业</ion-label>
+                <ion-input name="professionID" id="profession"  style="text-align: left;"  class="custom" :clear-input="true"
+                           placeholder="请输入专业" v-model="baseData.profession" ></ion-input>
+              </div>
               <div class="form-select">
-                <ion-label>政治面貌</ion-label>
-                <ion-select name="politicsStatusID"  id="politicsStatusID" okText="确定" cancelText="取消" v-model="baseData.politicsStatusID"
-                            interface="action-sheet" placeholder="请选择政治面貌" style="width:100%;text-align:left;" >
-                  <ion-select-option v-for=" (it,key) in politicsStatusList" :key="key" :value="it.value">
+                <ion-label>是否非全日制</ion-label>
+                <ion-select name="isFullTime"  id="isFullTime" okText="确定" cancelText="取消" v-model="baseData.isFullTime"
+                            interface="action-sheet" placeholder="请选择是否非全日制" style="width:100%;text-align:left;" >
+                  <ion-select-option v-for=" (it,key) in isFullTimeList" :key="key" :value="it.value">
+                    {{ it.name }}
+                  </ion-select-option>
+                </ion-select>
+              </div>
+              <div class="form-select">
+                <ion-label>职业资格类别</ion-label>
+                <ion-select name="occupationalCategory"  id="occupationalCategory" okText="确定" cancelText="取消" v-model="baseData.occupationalCategory"
+                            interface="action-sheet" placeholder="请选择职业资格类别" style="width:100%;text-align:left;" >
+                  <ion-select-option v-for=" (it,key) in occupationalCategoryList" :key="key" :value="it.value">
+                    {{ it.name }}
+                  </ion-select-option>
+                </ion-select>
+              </div>
+              <div class="form-select">
+                <ion-label>职业资格等级</ion-label>
+                <ion-select name="occupationalLevel"  id="occupationalLevel" okText="确定" cancelText="取消" v-model="baseData.occupationalLevel"
+                            interface="action-sheet" placeholder="请选择职业资格类别" style="width:100%;text-align:left;" >
+                  <ion-select-option v-for=" (it,key) in occupationalLevelList" :key="key" :value="it.value">
                     {{ it.name }}
                   </ion-select-option>
                 </ion-select>
               </div>
               <div class="form-input">
-                <ion-label>出生地</ion-label>
-                <ion-input name="birthPlace" id="birthPlace"  style="text-align: left;" class="custom" :clear-input="true"
-                           v-model="baseData.birthPlace" placeholder="请输入出生地" ></ion-input>
+                <ion-label>籍贯</ion-label>
+                <ion-input name="nativePlace" id="nativePlace"  style="text-align: left;" class="custom" :clear-input="true"
+                           v-model="baseData.nativePlace" placeholder="请输入籍贯" ></ion-input>
               </div>
-              <!--          <div class="form-input">
-                          <ion-label>出生日期</ion-label>
-                          <ion-datetime-button datetime="birthDay" style="position:relative;right:110px;"></ion-datetime-button>
-                          <ion-modal :keep-contents-mounted="true">
-                            <ion-datetime name="birthDay" id="birthDay" placeholder="日期"
-                                          v-model="baseData.birthDay"  :prefer-wheel="true"
-                                          dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
-                                          :show-default-buttons="true">
-                            </ion-datetime>
-                          </ion-modal>
-                        </div>-->
+              <!--          <div class="form-input">-->
+              <!--          <ion-label>出生地</ion-label>-->
+              <!--            <ion-input name="birthPlace" id="birthPlace"  style="text-align: left;" class="custom" :clear-input="true"-->
+              <!--                       v-model="baseData.birthPlace" placeholder="请输入出生地" ></ion-input>-->
+              <!--          </div>-->
+              <div class="form-select" >
+                <ion-label>出生日期</ion-label>
+                <ion-datetime-button datetime="birthDay" style="position:absolute;left:10px;"></ion-datetime-button>
+                <ion-modal :keep-contents-mounted="true">
+                  <ion-datetime name="birthDay" id="birthDay" placeholder="日期"
+                                v-model="baseData.birthDay"  :prefer-wheel="true"
+                                dataformatas="YYYY-MM-DD" presentation="date" cancel-text="取消" done-text="确定"
+                                :show-default-buttons="true">
+                  </ion-datetime>
+                </ion-modal>
+              </div>
+              <div style="width:100%;overflow: hidden;height: 30px;"></div>
               <div class="form-select">
                 <ion-label>户口性质</ion-label>
                 <ion-select name="familyNatureID"  id="familyNatureID" okText="确定" cancelText="取消" v-model="baseData.familyNatureID"
@@ -175,9 +224,9 @@
                 </ion-select>
               </div>
               <div class="form-select">
-                <ion-label>文化程度</ion-label>
+                <ion-label>最高学历</ion-label>
                 <ion-select name="cultureRank"  id="cultureRank" okText="确定" cancelText="取消" v-model="baseData.cultureRank"
-                            interface="action-sheet" placeholder="请选择文化程度" style="width:100%;text-align:left;">
+                            interface="action-sheet" placeholder="请选择最高学历" style="width:100%;text-align:left;">
                   <ion-select-option v-for=" (it,key) in cultureRankList" :key="key" :value="it.value">
                     {{ it.name }}
                   </ion-select-option>
@@ -676,7 +725,7 @@ export default defineComponent({
       jobUserStatusList.value = jobUserStatusResult;
       const keyPersonTypeResult :any = await getSysDictionaryList("KeyPersonType");
       keyPersonTypeList.value = keyPersonTypeResult;
-      const cultureRankResult :any = await getSysDictionaryList("CultureLevel");
+      const cultureRankResult :any = await getSysDictionaryList("HighestDegree");
       cultureRankList.value = cultureRankResult;
       const userHealthResult :any = await getSysDictionaryList("Health");
       userHealthList.value = userHealthResult;

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

@@ -48,25 +48,53 @@
           <ion-label>重点人员类别</ion-label>
           <ion-text>{{ dataModel.keyTypeName }}</ion-text>
         </div>
+
         <div class="form-detail">
-          <ion-label>民族</ion-label>
-          <ion-text>{{ dataModel.nation }}</ion-text>
+          <ion-label>社会保障卡号</ion-label>
+          <ion-text>{{ dataModel.socialSecurityCard }}</ion-text>
         </div>
-
         <div class="form-detail">
           <ion-label>政治面貌</ion-label>
           <ion-text>{{ dataModel.politicsStatusName }}</ion-text>
         </div>
         <div class="form-detail">
-          <ion-label>出生地</ion-label>
-          <ion-text>{{ dataModel.birthPlace }}</ion-text>
+          <ion-label>民族</ion-label>
+          <ion-text>{{ dataModel.nation }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>毕业院校</ion-label>
+          <ion-text>{{ dataModel.finishSchool }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>专业</ion-label>
+          <ion-text>{{ dataModel.profession }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>是否非全日制</ion-label>
+          <ion-text>{{ dataModel.isFullTimeName }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>职业资格类别</ion-label>
+          <ion-text style="width: 52%;">{{ dataModel.occupationalCategoryName }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>职业资格等级</ion-label>
+          <ion-text>{{ dataModel.occupationalLevelName }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>籍贯</ion-label>
+          <ion-text>{{ dataModel.nativePlace }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>出生日期</ion-label>
+          <ion-text>{{ dayjs(dataModel.birthDay).format("YYYY-MM-DD")  }}</ion-text>
         </div>
         <div class="form-detail">
           <ion-label>户口性质</ion-label>
           <ion-text>{{ dataModel.familyNatureName }}</ion-text>
         </div>
         <div class="form-detail">
-          <ion-label>文化程度</ion-label>
+          <ion-label>最高学历</ion-label>
           <ion-text>{{ dataModel.cultureName}}</ion-text>
         </div>
         <div class="form-detail">
@@ -121,7 +149,7 @@ import {getJobUserById} from "@/api/jobUserInfo";
 import {useRoute, useRouter} from "vue-router";
 import {onIonViewDidEnter} from "@ionic/vue";
 import {arrowBackOutline} from 'ionicons/icons';
-
+import dayjs from "dayjs";
 
 interface FormData{
   dataModel:any
@@ -167,6 +195,7 @@ export default defineComponent({
       onBack,
       loadData,
       router,
+      dayjs,
     }
   }
 });

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

@@ -129,6 +129,20 @@
           </div>
         </div>
         <div v-if="expand">
+          <div class="form-input">
+            <ion-label>社会保障卡号</ion-label>
+            <ion-input name="socialSecurityCard" id="socialSecurityCard"  style="text-align: left;"  class="custom" :clear-input="true"
+                       placeholder="请输入社会保障卡号" v-model="baseData.socialSecurityCard" ></ion-input>
+          </div>
+          <div class="form-select">
+          <ion-label>政治面貌</ion-label>
+            <ion-select name="politicsStatusID"  id="politicsStatusID" okText="确定" cancelText="取消" v-model="baseData.politicsStatusID"
+                        interface="action-sheet" placeholder="请选择政治面貌" style="width:100%;text-align:left;" >
+              <ion-select-option v-for=" (it,key) in politicsStatusList" :key="key" :value="it.value">
+                {{ it.name }}
+              </ion-select-option>
+            </ion-select>
+          </div>
           <div class="form-select">
             <ion-label>民族</ion-label>
             <ion-select name="nationID"  id="nationID" okText="确定" cancelText="取消" v-model="baseData.nation"
@@ -137,26 +151,57 @@
                 {{ it.name }}
               </ion-select-option>
             </ion-select>
-<!--            <ion-input name="nation" id="nation"  style="text-align: left;" class="custom"  :clear-input="true"
-                       v-model="baseData.nation" placeholder="请输入民族" ></ion-input>-->
+          </div>
+          <div class="form-input">
+            <ion-label>毕业院校</ion-label>
+            <ion-input name="finishSchool" id="finishSchool"  style="text-align: left;"  class="custom" :clear-input="true"
+                       placeholder="请输入毕业院校" v-model="baseData.finishSchool" ></ion-input>
+          </div>
+          <div class="form-input">
+            <ion-label>专业</ion-label>
+            <ion-input name="professionID" id="profession"  style="text-align: left;"  class="custom" :clear-input="true"
+                       placeholder="请输入专业" v-model="baseData.profession" ></ion-input>
           </div>
           <div class="form-select">
-          <ion-label>政治面貌</ion-label>
-            <ion-select name="politicsStatusID"  id="politicsStatusID" okText="确定" cancelText="取消" v-model="baseData.politicsStatusID"
-                        interface="action-sheet" placeholder="请选择政治面貌" style="width:100%;text-align:left;" >
-              <ion-select-option v-for=" (it,key) in politicsStatusList" :key="key" :value="it.value">
+            <ion-label>是否非全日制</ion-label>
+            <ion-select name="isFullTime"  id="isFullTime" okText="确定" cancelText="取消" v-model="baseData.isFullTime"
+                        interface="action-sheet" placeholder="请选择是否非全日制" style="width:100%;text-align:left;" >
+              <ion-select-option v-for=" (it,key) in isFullTimeList" :key="key" :value="it.value">
+                {{ it.name }}
+              </ion-select-option>
+            </ion-select>
+          </div>
+          <div class="form-select">
+            <ion-label>职业资格类别</ion-label>
+            <ion-select name="occupationalCategory"  id="occupationalCategory" okText="确定" cancelText="取消" v-model="baseData.occupationalCategory"
+                        interface="action-sheet" placeholder="请选择职业资格类别" style="width:100%;text-align:left;" >
+              <ion-select-option v-for=" (it,key) in occupationalCategoryList" :key="key" :value="it.value">
+                {{ it.name }}
+              </ion-select-option>
+            </ion-select>
+          </div>
+          <div class="form-select">
+            <ion-label>职业资格等级</ion-label>
+            <ion-select name="occupationalLevel"  id="occupationalLevel" okText="确定" cancelText="取消" v-model="baseData.occupationalLevel"
+                        interface="action-sheet" placeholder="请选择职业资格类别" style="width:100%;text-align:left;" >
+              <ion-select-option v-for=" (it,key) in occupationalLevelList" :key="key" :value="it.value">
                 {{ it.name }}
               </ion-select-option>
             </ion-select>
           </div>
           <div class="form-input">
-          <ion-label>出生地</ion-label>
-            <ion-input name="birthPlace" id="birthPlace"  style="text-align: left;" class="custom" :clear-input="true"
-                       v-model="baseData.birthPlace" placeholder="请输入出生地" ></ion-input>
+            <ion-label>籍贯</ion-label>
+            <ion-input name="nativePlace" id="nativePlace"  style="text-align: left;" class="custom" :clear-input="true"
+                       v-model="baseData.nativePlace" placeholder="请输入籍贯" ></ion-input>
           </div>
-<!--          <div class="form-input">
+<!--          <div class="form-input">-->
+<!--          <ion-label>出生地</ion-label>-->
+<!--            <ion-input name="birthPlace" id="birthPlace"  style="text-align: left;" class="custom" :clear-input="true"-->
+<!--                       v-model="baseData.birthPlace" placeholder="请输入出生地" ></ion-input>-->
+<!--          </div>-->
+          <div class="form-select" >
             <ion-label>出生日期</ion-label>
-            <ion-datetime-button datetime="birthDay" style="position:relative;right:110px;"></ion-datetime-button>
+            <ion-datetime-button datetime="birthDay" style="position:absolute;left:10px;"></ion-datetime-button>
             <ion-modal :keep-contents-mounted="true">
               <ion-datetime name="birthDay" id="birthDay" placeholder="日期"
                             v-model="baseData.birthDay"  :prefer-wheel="true"
@@ -164,7 +209,8 @@
                             :show-default-buttons="true">
               </ion-datetime>
             </ion-modal>
-          </div>-->
+          </div>
+          <div style="width:100%;overflow: hidden;height: 30px;"></div>
           <div class="form-select">
             <ion-label>户口性质</ion-label>
             <ion-select name="familyNatureID"  id="familyNatureID" okText="确定" cancelText="取消" v-model="baseData.familyNatureID"
@@ -175,9 +221,9 @@
             </ion-select>
           </div>
           <div class="form-select">
-          <ion-label>文化程度</ion-label>
+          <ion-label>最高学历</ion-label>
             <ion-select name="cultureRank"  id="cultureRank" okText="确定" cancelText="取消" v-model="baseData.cultureRank"
-                        interface="action-sheet" placeholder="请选择文化程度" style="width:100%;text-align:left;">
+                        interface="action-sheet" placeholder="请选择最高学历" style="width:100%;text-align:left;">
               <ion-select-option v-for=" (it,key) in cultureRankList" :key="key" :value="it.value">
                 {{ it.name }}
               </ion-select-option>
@@ -447,6 +493,9 @@ export default defineComponent({
     const maritalStatusList  = ref<SelectProps[]>([]);
     const provinceList  = ref<SelectProps[]>([{name:'广东省',value:'440000000000000'}]);
     const nationTypeList  = ref<SelectProps[]>([]);
+    const isFullTimeList  = ref<SelectProps[]>([]);
+    const occupationalCategoryList  = ref<SelectProps[]>([]);
+    const occupationalLevelList  = ref<SelectProps[]>([]);
     const familyNatureList = ref([]);
     const politicsStatusList = ref([]);
     const regionList  = ref<SelectProps[]>([]);
@@ -638,6 +687,7 @@ export default defineComponent({
         }
         inputDataValidate();
         if(isAllowCommit.value){
+          console.log("当前数据",baseInfoData.baseData);
           baseInfoSave(baseInfoData.baseData).then(result => {
             if (result) {
               router.push({path: './edit', query: {reload:0,jobUserID: baseInfoData.baseData.jobUserID,status:2}});
@@ -679,7 +729,7 @@ export default defineComponent({
       jobUserStatusList.value = jobUserStatusResult;
       const keyPersonTypeResult :any = await getSysDictionaryList("KeyPersonType");
       keyPersonTypeList.value = keyPersonTypeResult;
-      const cultureRankResult :any = await getSysDictionaryList("CultureLevel");
+      const cultureRankResult :any = await getSysDictionaryList("HighestDegree");
       cultureRankList.value = cultureRankResult;
       const userHealthResult :any = await getSysDictionaryList("Health");
       userHealthList.value = userHealthResult;
@@ -693,6 +743,12 @@ export default defineComponent({
       familyNatureList.value = familyNatureResult;
       const nationTypeListResult :any = await getSysDictionaryList("NationType");
       nationTypeList.value = nationTypeListResult;
+      const isFullTimeListResult :any = await getSysDictionaryList("IsFullTime");
+      isFullTimeList.value = isFullTimeListResult;
+      const occupationalCategoryListResult :any = await getSysDictionaryList("OccupationalCategory");
+      occupationalCategoryList.value = occupationalCategoryListResult;
+      const occupationalLevelListResult :any = await getSysDictionaryList("OccupationalLevel");
+      occupationalLevelList.value = occupationalLevelListResult;
     }
 
     const getSiteInfoList = async function(){
@@ -784,6 +840,9 @@ export default defineComponent({
       siteInfoList,
       genderList,
       nationTypeList,
+      isFullTimeList,
+      occupationalCategoryList,
+      occupationalLevelList,
       familyNatureList,
       politicsStatusList,
       pageParams,

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

@@ -339,8 +339,16 @@ public class JobUserServiceImpl implements JobUserService {
         jobUserExp2.or().andUserMobileEqualTo(data.getUserMobile()).andJobuserIDNotEqualTo(data.getJobUserID());
         var ifRepeatMobile = pcJobuserMapper.selectByExample(jobUserExp2).size()>0;
 
+
         result += ifRepeatIdentity? 1:0;
         result += ifRepeatMobile? 2:0;
+
+        if(!data.getSocialSecurityCard().equals(null)){
+            PcJobuserExample jobUserExp3= new PcJobuserExample();
+            jobUserExp3.or().andUserMobileEqualTo(data.getSocialSecurityCard()).andJobuserIDNotEqualTo(data.getJobUserID());
+            var ifRepeatSocialCard = pcJobuserMapper.selectByExample(jobUserExp3).size()>0;
+            result += ifRepeatSocialCard ? 4:0;
+        }
         return result;
     }
 
@@ -358,6 +366,14 @@ public class JobUserServiceImpl implements JobUserService {
                 throw new  BaseException("1004","联系电话已存在！");
             case 3:
                 throw new  BaseException("1004","身份证号码、联系电话重复！");
+            case 4:
+                throw new  BaseException("1004","社保卡已绑定其他人员！");
+            case 5:
+                throw new  BaseException("1004","身份证号码、社保卡号重复！");
+            case 6:
+                throw new  BaseException("1004","联系电话、社保卡号重复！");
+            case 7:
+                throw new  BaseException("1004","身份证号码、联系电话、社保卡号重复！");
         }
         PcJobuser dbData = pcJobuserMapper.selectByPrimaryKey(data.getJobUserID());
         if (dbData == null) {
@@ -395,6 +411,13 @@ public class JobUserServiceImpl implements JobUserService {
             dbData.setKeyPersonTypeID(data.getKeyPersonTypeID());
             dbData.setPersonalSkills(data.getPersonalSkills());
             dbData.setOpenId(data.getOpenId());
+            dbData.setSocialSecurityCard(data.getSocialSecurityCard());
+            dbData.setFinishSchool(data.getFinishSchool());
+            dbData.setProfession(data.getProfession());
+            dbData.setIsFullTime(data.getIsFullTime());
+            dbData.setOccupationalCategory(data.getOccupationalCategory());
+            dbData.setOccupationalLevel(data.getOccupationalLevel());
+            dbData.setNativePlace(data.getNativePlace());
             dbData.setCreateTime(new Date());
             dbData.setCreateUserID(userId);
             result = pcJobuserMapper.insert(dbData);
@@ -433,6 +456,13 @@ public class JobUserServiceImpl implements JobUserService {
             dbData.setKeyPersonTypeID(data.getKeyPersonTypeID());
             dbData.setPersonalSkills(data.getPersonalSkills());
             dbData.setOpenId(data.getOpenId());
+            dbData.setSocialSecurityCard(data.getSocialSecurityCard());
+            dbData.setFinishSchool(data.getFinishSchool());
+            dbData.setProfession(data.getProfession());
+            dbData.setIsFullTime(data.getIsFullTime());
+            dbData.setOccupationalCategory(data.getOccupationalCategory());
+            dbData.setOccupationalLevel(data.getOccupationalLevel());
+            dbData.setNativePlace(data.getNativePlace());
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
             result = pcJobuserMapper.updateByPrimaryKeySelective(dbData);

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

@@ -4,8 +4,8 @@
     <select id="selectJobUserList" resultType="com.hz.employmentsite.vo.jobUserManager.JobUserVo">
         select jobuser.* ,gender.name as GenderName,culture.name as CultureName,site.SiteName,jobstatus.name as
         JobStatusName,keytype.name as KeyTypeName,sys_politics.name as politicsStatusName,sys_health.name as healthName,
-        sys_family.name as familyNatureName,sys_full_time.Name as isFullTimeName, sys_occ_level.Name as
-        occupationalLevelName,sys_blood_type.Name as bloodTypeName,sys_marital_status.Name as MaritalStatusName,
+        sys_family.name as familyNatureName,sys_full_time.Name as isFullTimeName,sys_occ_category.Name as occupationalCategoryName,
+        sys_occ_level.Name as occupationalLevelName,sys_blood_type.Name as bloodTypeName,sys_marital_status.Name as MaritalStatusName,
         area_region.name as RegionName,area_street.name as StreetName,
         (select count(*) from pc_recommend recommend where jobuser.JobUserID = recommend.JobuserID and isRead = 1)as
         RecommendedCount
@@ -29,6 +29,8 @@
         jobuser.familyNatureID = sys_family.Value
         left join (select * from sys_dictionary_item where DictionaryCode ='IsFullTime') sys_full_time on
         jobuser.IsFullTime = sys_full_time.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='OccupationalCategory') sys_occ_category on
+        jobuser.OccupationalCategory = sys_occ_category.Value
         left join (select * from sys_dictionary_item where DictionaryCode ='OccupationalLevel') sys_occ_level on
         jobuser.OccupationalLevel = sys_occ_level.Value
         left join (select * from sys_dictionary_item where DictionaryCode ='BloodType') sys_blood_type on