fix: 求职人员字段数据显示BUG fix

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobUserController.java

@@ -165,7 +165,7 @@ public class JobUserController {
                 row.add(item.getName());
                 row.add(item.getIdentityNumber());
                 row.add(item.getGenderName());
-                row.add(item.getNation());
+                row.add(item.getNationName());
                 row.add(item.getUserMobile());
                 row.add(item.siteName);
                 row.add(dateUtils.getAgeForIdCard(item.getIdentityNumber()));

src/main/java/com/hz/employmentsite/model/PcJobuser.java

@@ -17,7 +17,7 @@ public class PcJobuser {
 
     private Integer sex;
 
-    private String nation;
+    private Integer nation;
 
     private Integer politicsStatusID;
 
@@ -147,12 +147,12 @@ public class PcJobuser {
         this.sex = sex;
     }
 
-    public String getNation() {
+    public Integer getNation() {
         return nation;
     }
 
-    public void setNation(String nation) {
-        this.nation = nation == null ? null : nation.trim();
+    public void setNation(Integer nation) {
+        this.nation = nation;
     }
 
     public Integer getPoliticsStatusID() {

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

@@ -32,7 +32,8 @@ public class JobUserVo {
 
     private Integer sex;
 
-    private String nation;
+    private Integer nation;
+    private String nationName;
 
     private Integer politicsStatusID;
 

src/main/resources/mapping/PcJobuserMapper.xml

@@ -9,7 +9,7 @@
     <result column="PyName" jdbcType="VARCHAR" property="pyName"/>
     <result column="EngName" jdbcType="VARCHAR" property="engName"/>
     <result column="Sex" jdbcType="INTEGER" property="sex"/>
-    <result column="Nation" jdbcType="VARCHAR" property="nation"/>
+    <result column="Nation" jdbcType="INTEGER" property="nation"/>
     <result column="PoliticsStatusID" jdbcType="INTEGER" property="politicsStatusID"/>
     <result column="Birthplace" jdbcType="VARCHAR" property="birthplace"/>
     <result column="BirthDay" jdbcType="TIMESTAMP" property="birthDay"/>
@@ -163,7 +163,7 @@
                             OccupationalCategory, OccupationalLevel)
     values (#{jobuserID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{identityNumber,jdbcType=VARCHAR},
             #{name,jdbcType=VARCHAR}, #{pyName,jdbcType=VARCHAR}, #{engName,jdbcType=VARCHAR},
-            #{sex,jdbcType=INTEGER}, #{nation,jdbcType=VARCHAR}, #{politicsStatusID,jdbcType=INTEGER},
+            #{sex,jdbcType=INTEGER}, #{nation,jdbcType=INTEGER}, #{politicsStatusID,jdbcType=INTEGER},
             #{birthplace,jdbcType=VARCHAR}, #{birthDay,jdbcType=TIMESTAMP}, #{familyNatureID,jdbcType=INTEGER},
             #{cultureRank,jdbcType=INTEGER}, #{healthID,jdbcType=INTEGER}, #{bloodTypeID,jdbcType=INTEGER},
             #{height,jdbcType=VARCHAR}, #{vision,jdbcType=VARCHAR}, #{weight,jdbcType=VARCHAR},
@@ -336,7 +336,7 @@
         #{sex,jdbcType=INTEGER},
       </if>
       <if test="nation != null">
-        #{nation,jdbcType=VARCHAR},
+        #{nation,jdbcType=INTEGER},
       </if>
       <if test="politicsStatusID != null">
         #{politicsStatusID,jdbcType=INTEGER},
@@ -479,7 +479,7 @@
         Sex = #{row.sex,jdbcType=INTEGER},
       </if>
       <if test="row.nation != null">
-        Nation = #{row.nation,jdbcType=VARCHAR},
+        Nation = #{row.nation,jdbcType=INTEGER},
       </if>
       <if test="row.politicsStatusID != null">
         PoliticsStatusID = #{row.politicsStatusID,jdbcType=INTEGER},
@@ -597,21 +597,21 @@
   <update id="updateByExample" parameterType="map">
     update pc_jobuser
     set JobuserID = #{row.jobuserID,jdbcType=VARCHAR},
-      SiteID = #{row.siteID,jdbcType=VARCHAR},
-      IdentityNumber = #{row.identityNumber,jdbcType=VARCHAR},
-      Name = #{row.name,jdbcType=VARCHAR},
-      PyName = #{row.pyName,jdbcType=VARCHAR},
-      EngName = #{row.engName,jdbcType=VARCHAR},
-      Sex = #{row.sex,jdbcType=INTEGER},
-      Nation = #{row.nation,jdbcType=VARCHAR},
-      PoliticsStatusID = #{row.politicsStatusID,jdbcType=INTEGER},
-      Birthplace = #{row.birthplace,jdbcType=VARCHAR},
-      BirthDay = #{row.birthDay,jdbcType=TIMESTAMP},
-      FamilyNatureID = #{row.familyNatureID,jdbcType=INTEGER},
-      CultureRank = #{row.cultureRank,jdbcType=INTEGER},
-      HealthID = #{row.healthID,jdbcType=INTEGER},
-      BloodTypeID = #{row.bloodTypeID,jdbcType=INTEGER},
-      Height = #{row.height,jdbcType=VARCHAR},
+    SiteID = #{row.siteID,jdbcType=VARCHAR},
+    IdentityNumber = #{row.identityNumber,jdbcType=VARCHAR},
+    Name = #{row.name,jdbcType=VARCHAR},
+    PyName = #{row.pyName,jdbcType=VARCHAR},
+    EngName = #{row.engName,jdbcType=VARCHAR},
+    Sex = #{row.sex,jdbcType=INTEGER},
+    Nation = #{row.nation,jdbcType=INTEGER},
+    PoliticsStatusID = #{row.politicsStatusID,jdbcType=INTEGER},
+    Birthplace = #{row.birthplace,jdbcType=VARCHAR},
+    BirthDay = #{row.birthDay,jdbcType=TIMESTAMP},
+    FamilyNatureID = #{row.familyNatureID,jdbcType=INTEGER},
+    CultureRank = #{row.cultureRank,jdbcType=INTEGER},
+    HealthID = #{row.healthID,jdbcType=INTEGER},
+    BloodTypeID = #{row.bloodTypeID,jdbcType=INTEGER},
+    Height = #{row.height,jdbcType=VARCHAR},
     Vision = #{row.vision,jdbcType=VARCHAR},
     Weight = #{row.weight,jdbcType=VARCHAR},
     MaritalStatusID = #{row.maritalStatusID,jdbcType=INTEGER},
@@ -666,7 +666,7 @@
         Sex = #{sex,jdbcType=INTEGER},
       </if>
       <if test="nation != null">
-        Nation = #{nation,jdbcType=VARCHAR},
+        Nation = #{nation,jdbcType=INTEGER},
       </if>
       <if test="politicsStatusID != null">
         PoliticsStatusID = #{politicsStatusID,jdbcType=INTEGER},
@@ -781,21 +781,21 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcJobuser">
     update pc_jobuser
-    set SiteID = #{siteID,jdbcType=VARCHAR},
-        IdentityNumber = #{identityNumber,jdbcType=VARCHAR},
-        Name = #{name,jdbcType=VARCHAR},
-        PyName = #{pyName,jdbcType=VARCHAR},
-        EngName = #{engName,jdbcType=VARCHAR},
-        Sex = #{sex,jdbcType=INTEGER},
-        Nation = #{nation,jdbcType=VARCHAR},
-        PoliticsStatusID = #{politicsStatusID,jdbcType=INTEGER},
-        Birthplace = #{birthplace,jdbcType=VARCHAR},
-        BirthDay = #{birthDay,jdbcType=TIMESTAMP},
-        FamilyNatureID = #{familyNatureID,jdbcType=INTEGER},
-        CultureRank = #{cultureRank,jdbcType=INTEGER},
-        HealthID = #{healthID,jdbcType=INTEGER},
-        BloodTypeID = #{bloodTypeID,jdbcType=INTEGER},
-        Height = #{height,jdbcType=VARCHAR},
+    set SiteID               = #{siteID,jdbcType=VARCHAR},
+        IdentityNumber       = #{identityNumber,jdbcType=VARCHAR},
+        Name                 = #{name,jdbcType=VARCHAR},
+        PyName               = #{pyName,jdbcType=VARCHAR},
+        EngName              = #{engName,jdbcType=VARCHAR},
+        Sex                  = #{sex,jdbcType=INTEGER},
+        Nation               = #{nation,jdbcType=INTEGER},
+        PoliticsStatusID     = #{politicsStatusID,jdbcType=INTEGER},
+        Birthplace           = #{birthplace,jdbcType=VARCHAR},
+        BirthDay             = #{birthDay,jdbcType=TIMESTAMP},
+        FamilyNatureID       = #{familyNatureID,jdbcType=INTEGER},
+        CultureRank          = #{cultureRank,jdbcType=INTEGER},
+        HealthID             = #{healthID,jdbcType=INTEGER},
+        BloodTypeID          = #{bloodTypeID,jdbcType=INTEGER},
+        Height               = #{height,jdbcType=VARCHAR},
         Vision               = #{vision,jdbcType=VARCHAR},
         Weight               = #{weight,jdbcType=VARCHAR},
         MaritalStatusID      = #{maritalStatusID,jdbcType=INTEGER},

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

@@ -10,7 +10,7 @@
         sys_family.name as familyNatureName,sys_full_time.Name as isFullTimeName,occ_cat.OccupationalName as
         occupationalCategoryName,
         sys_occ_level.Name as occupationalLevelName,sys_blood_type.Name as bloodTypeName,sys_marital_status.Name as
-        MaritalStatusName,
+        MaritalStatusName, sys_nation.Name as nationName,
         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
@@ -43,6 +43,8 @@
         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 (select * from sys_dictionary_item where DictionaryCode ='NationType') sys_nation on
+        jobuser.Nation = sys_nation.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
         left join pc_site_institution inSites on site.SiteID = inSites.SiteID

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

@@ -188,7 +188,7 @@ export default defineComponent({
       {title: '姓名', dataIndex: 'name', key: 'name', width: 100,align: "center"},
       {title: '公民身份号码', dataIndex: 'identityNumber', key: 'identityNumber', width: 170,align: "center"},
       {title: '性别', dataIndex: 'genderName', key: 'genderName', width: 80,align: "center"},
-      {title: '民族', dataIndex: 'nation', key: 'nation', width: 80,align: "center"},
+      {title: '民族', dataIndex: 'nationName', key: 'nationName', width: 80, align: "center"},
       {title: '联系电话', dataIndex: 'userMobile', key: 'userMobile',align: "center"},
       {title: '所属驿站', dataIndex: 'siteName', key: 'siteName',align: "center"},
       {

vue/src/views/jobUserManager/jobuser/vitae.vue

@@ -219,7 +219,7 @@ const loadExperienceData = (id: any) => {
 
 // 获取教育经历数据
 const getCultureList = () => {
-  getSysDictionaryList('CultureLevel').then((data) => {
+  getSysDictionaryList('HighestDegree').then((data) => {
     cultureList.value = data;
   });
 };
@@ -235,9 +235,11 @@ function getCultureName(value: any) {
 // 页面初始化
 onMounted(() => {
   const id = history.state.params?.id;
-  loadData(id);
-  loadEducation(id);
-  loadExperienceData(id)
+  if (id) {
+    loadData(id);
+    loadEducation(id);
+    loadExperienceData(id)
+  }
   getCultureList()
 })
 </script>