feat: 求职人员地图调整

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

@@ -11,8 +11,12 @@ public class JobUserMapVo {
 
     private String name;
 
+    private Integer sex;
+
     private Integer age;
 
+    private String finishDate;
+
     private String keyTypeName;
 
     private String longitude;
@@ -21,6 +25,8 @@ public class JobUserMapVo {
 
     private String siteName;
 
+    private String regionName;
+
     private int recommendedCount;
 
     private Integer entryState;

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

@@ -117,6 +117,8 @@
         SELECT
         jobuser.JobuserID,
         jobuser.`Name`,
+        jobuser.sex,
+        jobuser.finishDate,
         keytype.`Name` AS keyTypeName,
         TIMESTAMPDIFF(
         YEAR,
@@ -125,6 +127,7 @@
         jobuser.Longitude,
         jobuser.Latitude,
         site.SiteName,
+        area.`Name` AS regionName,
         recommendCountData.RecommendedCount,
         mgtEntryState.EntryState,
         (
@@ -147,6 +150,7 @@
         LEFT JOIN sys_dictionary_item keytype ON jobuser.KeyPersonTypeID = keytype.`Value`
         AND keytype.DictionaryCode = 'KeyPersonType'
         LEFT JOIN pc_site site ON jobuser.SiteID = site.SiteID
+        LEFT JOIN area_code area ON site.RegionCode = area.`code`
         LEFT JOIN (
         SELECT
         job_user.JobUserID,

vue/src/views/dataMap/jobUserDataMap.vue

@@ -66,8 +66,9 @@
                  @mouseenter="jobUserMouseenter(jobUser)"
                  @mouseleave="jobUserMouseenter({jobUserID:-1})"
             >
-              <p class="font-size-14 font-weight-600 margin-bottom-8">{{ jobUser.name }}</p>
+              <p class="font-size-14 font-weight-600 margin-bottom-8">{{ jobUser.name }}({{ jobUser.regionName }})</p>
               <p class="label-text">年龄：{{ jobUser.age }}</p>
+              <p class="label-text">性别：{{ jobUser.sex == 1 ? '男' : '女' }}</p>
               <!-- 岗位 -->
               <div class="jobHunt-box label-text">
                 <span style="width: 65px; flex: 0 0 auto">求职意向：</span>
@@ -425,20 +426,35 @@ function checkJobUser(jobUser: any) {
   if (jobUser.longitude && jobUser.latitude) {
     // 设置地图中心点
     (map as any).centerAndZoom(new T.LngLat(jobUser.longitude, jobUser.latitude), (map as any).getZoom());
+    let labelHtml = '';
+    if (jobUser.labelList && jobUser.labelList.length > 0) {
+      jobUser.labelList.forEach((item: any) => {
+        labelHtml += `
+          <span style="padding: 2px 5px; background-color: #eaeaea; color: #545454">${item.labelName}</span>
+        `
+      })
+    }
     // 地图打开弹窗
     let winHtml = `
       <div>
-        <span style="font-size: 14px; font-weight: 600;margin-bottom: 5px;">${jobUser.name}(${jobUser.siteName})</span><br><br>
-        <span>年龄：${jobUser.age}岁</span><br>
-        <span>重点人员类别：${jobUser.keyTypeName}</span><br>
-        <span>推荐岗位次数：${jobUser.recommendedCount}次</span><br>
-        <span>入职情况：${jobUser.entryState == 1 ? '已入职' : '未入职'}</span>
+        <div style="width: 100%; display: flex; justify-content: space-between">
+            <span style="font-size: 14px; font-weight: 600;margin-bottom: 5px; margin-right: 10px;">${jobUser.name}</span>
+            <span style="font-size: 14px; font-weight: 600;margin-bottom: 5px;">${jobUser.siteName}</span>
+        </div>
+        <div>
+            ${labelHtml}
+        </div>
+        <div style="width: 100%; margin-top: 5px;">
+          <span>服务情况：已推荐${jobUser.recommendedCount}次</span><br>
+          <span>入职情况：${jobUser.entryState == 1 ? '已入职' : '未入职'}</span><br>
+          <span>${jobUser.finishDate ? '毕业时间：' + jobUser.finishDate : ''}</span>
+        </div>
       </div>
     `;
     (map as any).openInfoWindow(winHtml, new T.LngLat(jobUser.longitude, jobUser.latitude), {
       autoPan: true,
-      maxHeight: 300,
-      maxWidth: 400,
+      maxHeight: 400,
+      maxWidth: 1000,
       offset: new T.Point(10, 0)
     });
   }
@@ -714,7 +730,7 @@ export default {
 
       .jobHunt-box {
         border-radius: 10px;
-        background-color: white;
+        background-color: #d5f2ff;
         padding: 8px 10px;
         margin-bottom: 10px;