From 6e1f39f8bc369f9ffc1d2f8623a5f3c70e6ec5ea Mon Sep 17 00:00:00 2001
From: chenxu1234 <1401584727@qq.com>
Date: Tue, 23 Apr 2024 18:06:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E7=A6=8F=E9=A1=B9=E7=9B=AE=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE=E8=B0=83=E6=95=B4=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/entity/chart/ChartPO.java    |  4 +++
 .../service/impl/ChartServiceImpl.java        | 27 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/entity/chart/ChartPO.java b/src/com/engine/organization/entity/chart/ChartPO.java
index da8b4d17..b7207f9f 100644
--- a/src/com/engine/organization/entity/chart/ChartPO.java
+++ b/src/com/engine/organization/entity/chart/ChartPO.java
@@ -41,6 +41,10 @@ public class ChartPO {
     // 人员头像
     private String fleaderimg;
 
+    private String jobTitle;
+
+    private String jobFj;
+
     private String id;
     private String key;
 
diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index bb9755b2..61fa170b 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -26,6 +26,7 @@ import weaver.general.Util;
 import weaver.hrm.User;
 import weaver.hrm.company.DepartmentComInfo;
 import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.job.JobTitlesComInfo;
 import weaver.hrm.resource.ResourceComInfo;
 
 import java.time.LocalDate;
@@ -367,6 +368,9 @@ public class ChartServiceImpl extends Service implements ChartService {
      */
     private ChartPO getResourceChartPO(String id, String name, String parentId, String belongTo, String companyWorkYear) {
         ChartPO chartPO = new ChartPO();
+        try {
+        ResourceComInfo comInfo = new ResourceComInfo();
+        JobTitlesComInfo jobInfo = new JobTitlesComInfo();
         chartPO.setFtype("4");
         chartPO.setFobjid(id);
         chartPO.setId(chartPO.getFobjid());
@@ -377,7 +381,12 @@ public class ChartServiceImpl extends Service implements ChartService {
         chartPO.setHasChildren("0");
         chartPO.setBelongto(Util.null2String(belongTo));
         chartPO.setCompanyWorkYear(companyWorkYear);
-        try {
+        chartPO.setJobTitle(jobInfo.getJobTitlesname(comInfo.getJobTitle(id)));
+        String jobFj = getJobFj(comInfo.getJobTitle(id));
+        if(StringUtils.isBlank(jobFj)){
+            jobFj = "0";
+        }
+        chartPO.setJobFj(jobFj);
             chartPO.setFleaderimg(new ResourceComInfo().getMessagerUrls(chartPO.getId()));
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -385,6 +394,22 @@ public class ChartServiceImpl extends Service implements ChartService {
         return chartPO;
     }
 
+    /**
+     * 获取岗位说明附件
+     * @param id
+     * @return
+     */
+    public static String getJobFj(String id){
+        RecordSet rs = new RecordSet();
+        String gwsms = "";
+        String sql = "select gwsms from uf_zw where zw = "+id;
+        rs.executeQuery(sql);
+        if (rs.next()){
+            gwsms = Util.null2String(rs.getString("gwsms"));
+        }
+        return gwsms;
+    }
+
     /**
      * 获取历史顶部元素sql
      *