app-求职人员信息收集bug处理1

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

@@ -114,11 +114,8 @@
           <div class="form-title">
             其他信息
             <div style="float: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-label style="color: red;font-size: 14px;" @click="isShow=!isShow">{{isShow?"收起":"展开"}}</ion-label>
+            </div>
           </div>
 
           <div v-show="isShow" >
@@ -205,7 +202,7 @@
   </ion-page>
 </template>
 <script lang="ts">
-import {chevronDownOutline, chevronUpOutline, arrowBackOutline} from 'ionicons/icons';
+import {arrowBackOutline} from 'ionicons/icons';
 import {defineComponent, ref, reactive, computed, toRefs} from "vue";
 import {useRoute,useRouter} from "vue-router";
 import {getRegionList, getSiteList, getStreeList} from '@/api/company/index';
@@ -325,7 +322,6 @@ export default defineComponent({
     const getCompanyTypeList = async function(){
       const companyTypeResult :any = await getSysDictionaryList("CompanyType");
       companyTypeList.value = companyTypeResult;
-      console.log("td",companyTypeList.value);
     }
 
     const rules = computed(() => {
@@ -486,8 +482,6 @@ export default defineComponent({
     return {
       ...toRefs(formState),
       arrowBackOutline,
-      chevronDownOutline,
-      chevronUpOutline,
       route,
       router,
       isShow,

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

@@ -111,10 +111,7 @@
           <div class="form-title">
             其他信息
             <div style="float: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>
+              <ion-label style="color: red;font-size: 14px;" @click="isShow=!isShow">{{isShow?"收起":"展开"}}</ion-label>
             </div>
           </div>
 
@@ -203,7 +200,7 @@
 </template>
 <script lang="ts">
 import {computed, defineComponent, reactive, ref, toRefs} from "vue";
-import {arrowBackOutline, chevronDownOutline, chevronUpOutline} from 'ionicons/icons';
+import {arrowBackOutline} from 'ionicons/icons';
 import {useRouter} from "vue-router";
 import dayjs from "dayjs";
 import {useRoute} from "vue-router/dist/vue-router";
@@ -447,8 +444,6 @@ export default defineComponent({
     return {
       ...toRefs(formState),
       arrowBackOutline,
-      chevronDownOutline,
-      chevronUpOutline,
       route,
       router,
       isShow,

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

@@ -63,24 +63,40 @@
               </ion-select>
               <!--          <ion-note slot="error">所属驿站不能为空</ion-note>-->
             </div>
+            <ion-label style="padding-left: 10px;">所属街道<span class="danger">*</span></ion-label>
             <div class="form-select">
-              <ion-label>市/县<span class="danger">*</span></ion-label>
-              <ion-select class="disable" disabled name="regionCode"  id="regionCode" okText="确定" cancelText="取消" v-model="baseData.regionCode"
-                          interface="action-sheet" placeholder="请选择市/县" style="width:100%;text-align:left;" @ionChange="regionChange()" >
+              <ion-select disabled name="regionCode"  id="regionCode" okText="确定" cancelText="取消" v-model="baseData.regionCode"
+                          interface="action-sheet" placeholder="请选择市/县" style="width:50%;float:left;" @ionChange="regionChange()" >
                 <ion-select-option v-for=" (it,key) in regionList" :key="key" :value="it.code">
                   {{ it.name }}
                 </ion-select-option>
               </ion-select>
-            </div>
-            <div class="form-select">
-              <ion-label>所在街道<span class="danger">*</span></ion-label>
-              <ion-select name="streetCode"  id="streetCode" okText="确定" cancelText="取消" v-model="baseData.streetCode"
-                          interface="action-sheet" placeholder="请选择镇/街" style="width:100%;text-align:left;">
-                <ion-select-option v-for=" (it,key) in streetList" :key="key" :value="it.code">
-                  {{ it.name }}
+              <ion-select interface="action-sheet" placeholder="请选择所属街道" cancel-text="取消"
+                          id="streetCode" v-model="baseData.streetCode" style="width: 50%;float: left;">
+                <ion-select-option v-for="(record,key) in streetList" :key="key"
+                                   v-model:value="record.code">
+                  {{ record.name }}
                 </ion-select-option>
               </ion-select>
             </div>
+<!--            <div class="form-select">-->
+<!--              <ion-label>市/县<span class="danger">*</span></ion-label>-->
+<!--              <ion-select class="disable" disabled name="regionCode"  id="regionCode" okText="确定" cancelText="取消" v-model="baseData.regionCode"-->
+<!--                          interface="action-sheet" placeholder="请选择市/县" style="width:100%;text-align:left;" @ionChange="regionChange()" >-->
+<!--                <ion-select-option v-for=" (it,key) in regionList" :key="key" :value="it.code">-->
+<!--                  {{ it.name }}-->
+<!--                </ion-select-option>-->
+<!--              </ion-select>-->
+<!--            </div>-->
+<!--            <div class="form-select">-->
+<!--              <ion-label>所在街道<span class="danger">*</span></ion-label>-->
+<!--              <ion-select name="streetCode"  id="streetCode" okText="确定" cancelText="取消" v-model="baseData.streetCode"-->
+<!--                          interface="action-sheet" placeholder="请选择镇/街" style="width:100%;text-align:left;">-->
+<!--                <ion-select-option v-for=" (it,key) in streetList" :key="key" :value="it.code">-->
+<!--                  {{ it.name }}-->
+<!--                </ion-select-option>-->
+<!--              </ion-select>-->
+<!--            </div>-->
             <div class="form-input">
               <ion-label>住址<span class="danger">*</span></ion-label>
               <ion-input name="address" id="address"  style="text-align: left;"  class="custom" :clear-input="true"
@@ -109,10 +125,7 @@
             <div class="form-title">
               其他信息
               <div style="float: right;">
-                <ion-icon :icon="chevronDownOutline"  @click="expandChange" v-if="!expand"
-                          style="font-size: 24px;"></ion-icon>
-                <ion-icon :icon="chevronUpOutline"  @click="expandChange" v-if="expand"
-                          style="font-size: 24px;"></ion-icon>
+                <ion-label style="color: red;font-size: 14px;" @click="expand=!expand">{{expand?"收起":"展开"}}</ion-label>
               </div>
             </div>
             <div v-if="expand">
@@ -378,7 +391,7 @@
 </template>
 <script lang="ts">
 import {computed, defineComponent, reactive, ref, toRefs, watch} from "vue";
-import {addCircleOutline, arrowBackOutline, chevronDownOutline, chevronUpOutline, trashOutline} from 'ionicons/icons';
+import {addCircleOutline, arrowBackOutline, trashOutline} from 'ionicons/icons';
 import {useRoute, useRouter} from "vue-router";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {baseInfoSave, getJobUserById} from "@/api/jobUserInfo";
@@ -758,8 +771,6 @@ export default defineComponent({
 
     return {
       ...toRefs(baseInfoData),
-      chevronDownOutline,
-      chevronUpOutline,
       arrowBackOutline,
       addCircleOutline,
       trashOutline,

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

@@ -16,25 +16,98 @@
           <ion-label>姓名</ion-label>
           <ion-text>{{ dataModel.name }}</ion-text>
         </div>
+        <div class="form-detail">
+          <ion-label>身份证号码</ion-label>
+          <ion-text>{{ dataModel.identityNumber }}</ion-text>
+        </div>
         <div class="form-detail">
           <ion-label>性别</ion-label>
           <ion-text>{{ dataModel.genderName }}</ion-text>
         </div>
+        <div class="form-detail">
+          <ion-label>联系电话</ion-label>
+          <ion-text>{{ dataModel.userMobile }}</ion-text>
+        </div>
         <div class="form-detail">
           <ion-label>所属驿站</ion-label>
           <ion-text>{{ dataModel.siteName }}</ion-text>
         </div>
         <div class="form-detail">
-          <ion-label>状态</ion-label>
+          <ion-label>所属街道</ion-label>
+          <ion-text>{{ dataModel.regionName+"-"+dataModel.streetName }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>居住地址</ion-label>
+          <ion-text>{{ dataModel.address }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>就业状态</ion-label>
           <ion-text>{{ dataModel.jobStatusName }}</ion-text>
         </div>
         <div class="form-detail">
-          <ion-label>联系电话</ion-label>
-          <ion-text>{{ dataModel.userMobile }}</ion-text>
+          <ion-label>重点人员类别</ion-label>
+          <ion-text>{{ dataModel.keyTypeName }}</ion-text>
         </div>
         <div class="form-detail">
-          <ion-label>居住地址</ion-label>
-          <ion-text>{{ dataModel.address }}</ion-text>
+          <ion-label>民族</ion-label>
+          <ion-text>{{ dataModel.nation }}</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>
+        </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-text>{{ dataModel.cultureName}}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>健康状况</ion-label>
+          <ion-text>{{ dataModel.healthName }}</ion-text>
+        </div>
+        <div class="form-detail" name="bloodTypeName">
+          <ion-label>血型</ion-label>
+          <ion-text>{{ dataModel.bloodTypeName }}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>身高</ion-label>
+          <ion-text v-if="dataModel.height!=null">{{ dataModel.height +"cm"}}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>视力</ion-label>
+          <ion-text>{{ dataModel.vision}}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>体重</ion-label>
+          <ion-text  v-if="dataModel.weight!=null">{{ dataModel.weight +"kg"}}</ion-text>
+        </div>
+        <div class="form-detail" name="maritalStatusName">
+          <ion-label>婚姻状况</ion-label>
+          <ion-text>{{ dataModel.maritalStatusName}}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>联系人</ion-label>
+          <ion-text>{{ dataModel.userName}}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>电子邮箱</ion-label>
+          <ion-text>{{ dataModel.email}}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>家庭住址</ion-label>
+          <ion-text>{{ dataModel.familyAddress}}</ion-text>
+        </div>
+        <div class="form-detail">
+          <ion-label>兴趣爱好</ion-label>
+          <ion-text>{{ dataModel.hobby}}</ion-text>
         </div>
       </div>
     </ion-content>

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

@@ -63,24 +63,40 @@
               </ion-select>
               <!--          <ion-note slot="error">所属驿站不能为空</ion-note>-->
             </div>
+            <ion-label style="padding-left: 10px;">所属街道<span class="danger">*</span></ion-label>
             <div class="form-select">
-              <ion-label>市/县<span class="danger">*</span></ion-label>
               <ion-select disabled name="regionCode"  id="regionCode" okText="确定" cancelText="取消" v-model="baseData.regionCode"
-                          interface="action-sheet" placeholder="请选择市/县" style="width:100%;text-align:left;" @ionChange="regionChange()" >
+                          interface="action-sheet" placeholder="请选择市/县" style="width:50%;float:left;" @ionChange="regionChange()" >
                 <ion-select-option v-for=" (it,key) in regionList" :key="key" :value="it.code">
                   {{ it.name }}
                 </ion-select-option>
               </ion-select>
-            </div>
-            <div class="form-select">
-              <ion-label>所在街道<span class="danger">*</span></ion-label>
-              <ion-select name="streetCode"  id="streetCode" okText="确定" cancelText="取消" v-model="baseData.streetCode"
-                          interface="action-sheet" placeholder="请选择镇/街" style="width:100%;text-align:left;">
-                <ion-select-option v-for=" (it,key) in streetList" :key="key" :value="it.code">
-                  {{ it.name }}
+              <ion-select interface="action-sheet" placeholder="请选择所属街道" cancel-text="取消"
+                          id="streetCode" v-model="baseData.streetCode" style="width: 50%;float: left;">
+                <ion-select-option v-for="(record,key) in streetList" :key="key"
+                                   v-model:value="record.code">
+                  {{ record.name }}
                 </ion-select-option>
               </ion-select>
             </div>
+<!--            <div class="form-select">-->
+<!--              <ion-label>市/县<span class="danger">*</span></ion-label>-->
+<!--              <ion-select disabled name="regionCode"  id="regionCode" okText="确定" cancelText="取消" v-model="baseData.regionCode"-->
+<!--                          interface="action-sheet" placeholder="请选择市/县" style="width:100%;text-align:left;" @ionChange="regionChange()" >-->
+<!--                <ion-select-option v-for=" (it,key) in regionList" :key="key" :value="it.code">-->
+<!--                  {{ it.name }}-->
+<!--                </ion-select-option>-->
+<!--              </ion-select>-->
+<!--            </div>-->
+<!--            <div class="form-select">-->
+<!--              <ion-label>所在街道<span class="danger">*</span></ion-label>-->
+<!--              <ion-select name="streetCode"  id="streetCode" okText="确定" cancelText="取消" v-model="baseData.streetCode"-->
+<!--                          interface="action-sheet" placeholder="请选择镇/街" style="width:100%;text-align:left;">-->
+<!--                <ion-select-option v-for=" (it,key) in streetList" :key="key" :value="it.code">-->
+<!--                  {{ it.name }}-->
+<!--                </ion-select-option>-->
+<!--              </ion-select>-->
+<!--            </div>-->
             <div class="form-input">
               <ion-label>住址<span class="danger">*</span></ion-label>
               <ion-input name="address" id="address"  style="text-align: left;"  class="custom" :clear-input="true"
@@ -109,10 +125,7 @@
         <div class="form-title">
           其他信息
           <div style="float: right;">
-            <ion-icon :icon="chevronDownOutline"  @click="expandChange" v-if="!expand"
-                      style="font-size: 24px;"></ion-icon>
-            <ion-icon :icon="chevronUpOutline"  @click="expandChange" v-if="expand"
-                      style="font-size: 24px;"></ion-icon>
+            <ion-label style="color: red;font-size: 14px;" @click="expand=!expand">{{expand?"收起":"展开"}}</ion-label>
           </div>
         </div>
         <div v-if="expand">
@@ -379,7 +392,7 @@
   </ion-page>
 </template>
 <script lang="ts">
-import {chevronDownOutline, chevronUpOutline,arrowBackOutline,addCircleOutline,trashOutline} from 'ionicons/icons';
+import {arrowBackOutline,addCircleOutline,trashOutline} from 'ionicons/icons';
 import {reactive,defineComponent, computed,watch,ref,toRefs} from "vue";
 import {post} from "@/api/common";
 import {useRoute, useRouter} from "vue-router";
@@ -758,8 +771,6 @@ export default defineComponent({
 
     return {
       ...toRefs(baseInfoData),
-      chevronDownOutline,
-      chevronUpOutline,
       arrowBackOutline,
       addCircleOutline,
       trashOutline,

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

@@ -49,6 +49,8 @@ public class JobUserVo {
 
     private Integer bloodTypeID;
 
+    private String bloodTypeName;
+
     private String height;
 
     private String vision;
@@ -57,12 +59,18 @@ public class JobUserVo {
 
     private Integer maritalStatusID;
 
+    private String MaritalStatusName;
+
     private String provinceCode;
 
     private String regionCode;
 
+    private String regionName;
+
     private String streetCode;
 
+    private String streetName;
+
     private String userName;
 
     private String userMobile;

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

@@ -5,7 +5,8 @@
         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,
+        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
         ,case when jobuser.IdentityNumber is not null and jobuser.IdentityNumber <![CDATA[ <> ]]>'' then
@@ -29,7 +30,13 @@
         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 ='OccupationalLevel') sys_occ_level on
-        jobuser.OccupationalLevel = sys_family.Value
+        jobuser.OccupationalLevel = sys_occ_level.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='BloodType') sys_blood_type on
+        jobuser.BloodTypeID = sys_blood_type.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='MaritalStatus') sys_marital_status on
+        jobuser.MaritalStatusID = sys_marital_status.Value
+        left join area_code area_region on jobuser.RegionCode = area_region.code
+        left join area_code area_street on jobuser.StreetCode = area_street.code
         where 1=1
         <if test="jobUserIDList != '' and jobUserIDList != null">
             and jobuser.jobuserID in (${jobUserIDList})