From 28cfaebda1b2dc5b0282429546aca48451fe3aa4 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 14 Apr 2025 14:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=9B=E8=99=B9=E7=AE=80=E5=8E=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WEB-INF/prop/shkjsecond.properties            | 31 +++++++++++++++++++
 .../impl/PersonnelResumeServiceImpl.java      | 10 +++---
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 WEB-INF/prop/shkjsecond.properties

diff --git a/WEB-INF/prop/shkjsecond.properties b/WEB-INF/prop/shkjsecond.properties
new file mode 100644
index 0000000..544071a
--- /dev/null
+++ b/WEB-INF/prop/shkjsecond.properties
@@ -0,0 +1,31 @@
+## 户口
+residence=field31
+
+##政治面貌
+politicsStatus=field28
+
+##民族
+nation=field44
+
+##毕业院校
+graduateSchool=field23
+
+##专业
+major=field22
+
+##家庭地址
+address=field43
+
+##职业资格证书/职称
+jobcall=field35
+
+##应急联系人(基本信息)
+emergencyContact=field0
+
+##关系(基本信息)
+relationship=field1
+
+##应急联系人电话(基本信息)
+eContactMobile=field2
+
+#
\ No newline at end of file
diff --git a/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java
index 2a243bb..efeee0d 100644
--- a/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java
+++ b/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java
@@ -255,6 +255,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         String graduateSchool = rs.getPropValue("shkjsecond", "graduateSchool");
         String major = rs.getPropValue("shkjsecond", "major");
         String address = rs.getPropValue("shkjsecond", "address");
+        String jobcall = rs.getPropValue("shkjsecond", "jobcall");
         String emergencyContact = rs.getPropValue("shkjsecond", "emergencyContact");
         String relationship = rs.getPropValue("shkjsecond", "relationship");
         String eContactMobile = rs.getPropValue("shkjsecond", "eContactMobile");
@@ -263,11 +264,12 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         rs.executeQuery("SELECT h.id, lastname, sex, birthday, resourceimageid, certificatenum, e."+residence+" as residence, " +
                 " e."+politicsStatus+" as politicsStatus, e."+nation+" as nation, nativeplace, height, weight, maritalstatus, companystartdate, " +
                 " b.jobtitlename AS jobTitle, a.departmentname as department, c.name as educationlevel, e."+graduateSchool+" as graduateSchool, " +
-                " e."+major+" as major, d.name as jobcall, e."+address+" as address, mobile, email, e."+emergencyContact+" as emergencyContact, " +
-                " e."+relationship+" as relationship, e."+eContactMobile+" as eContactMobile FROM hrmresource h " +
+                " e."+major+" as major, e."+jobcall+" as jobcall, e."+address+" as address, mobile, email, d."+emergencyContact+" as emergencyContact, " +
+                " d."+relationship+" as relationship, d."+eContactMobile+" as eContactMobile FROM hrmresource h " +
                 " LEFT JOIN hrmdepartment a ON a.id = h.departmentid LEFT JOIN hrmjobtitles b ON b.id = h.jobtitle " +
-                " LEFT JOIN hrmeducationlevel c on c.id = h.educationlevel LEFT JOIN hrmjobcall d on d.id = h.jobcall " +
-                " LEFT JOIN cus_fielddata e on e.id = h.id and scopeid = 1 and scope = 'HrmCustomFieldByInfoType' where h.id = ?",resourceId);
+                " LEFT JOIN hrmeducationlevel c on c.id = h.educationlevel " +
+                " LEFT JOIN cus_fielddata d on d.id = h.id and d.scopeid = -1 and d.scope = 'HrmCustomFieldByInfoType' " +
+                " LEFT JOIN cus_fielddata e on e.id = h.id and e.scopeid = 1 and e.scope = 'HrmCustomFieldByInfoType' where h.id = ?",resourceId);
         PersonnelResumePo personnelResumePo = PersonnelResumePo.builder().build();
         if (rs.next()) {
             personnelResumePo.setLastName(Util.null2String(rs.getString("lastname")));