fix: 求职人员地图查询就业状态改为查询主表字段

src/main/java/com/hz/employmentsite/vo/dataMap/JobUserMapVo.java

@@ -36,6 +36,8 @@ public class JobUserMapVo {
 
     private Integer jobStatusID;
 
+    private String jobStatusName;
+
     // JSON格式的列表数据
     private String labelList;
     private List<JobHuntVo> jobHuntList;

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

@@ -120,6 +120,7 @@
         jobuser.sex,
         jobuser.finishDate,
         jobuser.jobStatusID,
+        jobstatus.`Name` as jobStatusName,
         keytype.`Name` AS keyTypeName,
         TIMESTAMPDIFF(
         YEAR,
@@ -130,7 +131,6 @@
         site.SiteName,
         area.`Name` AS regionName,
         recommendCountData.RecommendedCount,
-        mgtEntryState.EntryState,
         (
         SELECT
         JSON_ARRAYAGG( JSON_OBJECT( 'labelID', labelTemp.LabelID, 'labelName', labelTemp.LabelName ) )
@@ -163,18 +163,8 @@
         GROUP BY
         job_user.JobUserID
         ) recommendCountData ON recommendCountData.JobUserID = jobuser.JobUserID
-        LEFT JOIN (
-        SELECT
-        job_user.JobUserID,
-        MAX(mgt.EntryState) AS EntryState
-        FROM
-        pc_jobuser job_user
-        LEFT JOIN pc_jobhunt hunt ON job_user.JobUserID = hunt.JobUserID
-        LEFT JOIN pc_recommend_mgt mgt ON hunt.JobHuntID = mgt.JobHuntID
-        AND mgt.EntryState = 1
-        GROUP BY
-        job_user.JobUserID
-        ) mgtEntryState ON mgtEntryState.JobUserID = jobuser.JobUserID
+        left join sys_dictionary_item jobstatus on jobuser.JobStatusID = jobstatus.value and
+        jobstatus.DictionaryCode='JobStatus'
         WHERE 1=1
         <if test="keyTypeValue != null">
             and keytype.`Value` = #{keyTypeValue}

vue/src/views/dataMap/jobUserDataMap.vue

@@ -128,7 +128,7 @@
           <p class="label-text">年龄：{{ nowCheckJobUser.age }}岁</p>
           <p class="label-text">重点人员类别：{{ nowCheckJobUser.keyTypeName }}</p>
           <p class="label-text">已推荐岗位数量：{{ nowCheckJobUser.recommendedCount }}个</p>
-          <p class="label-text">入职情况：{{ nowCheckJobUser.entryState == 1 ? '已入职' : '未入职' }}</p>
+          <p class="label-text">就业状态：{{ nowCheckJobUser.jobStatusName }}</p>
           <!-- 标签 -->
           <div class="label-box" v-if="nowCheckJobUser.labelList.length > 0"
                :ref="el => nowCheckJobUserLabelBoxRef = el"
@@ -481,7 +481,7 @@ function checkJobUser(jobUser: any) {
         </div>
         <div style="width: 100%; margin-top: 5px;">
           <span>服务情况：已推荐${jobUser.recommendedCount}次</span><br>
-          <span>入职情况：${jobUser.entryState == 1 ? '已入职' : '未入职'}</span><br>
+          <span>就业状态：${jobUser.jobStatusName}</span><br>
           <span>${jobUser.finishDate ? '毕业时间：' + jobUser.finishDate : ''}</span>
         </div>
       </div>
@@ -827,7 +827,7 @@ export default {
       background-color: white;
       padding: 10px;
       width: 100%;
-      height: 165px;
+      max-height: 165px;
       overflow-y: auto;
       border-radius: 10px;
     }