From defdc7c73fc0ba9aa128d33baef2cd1c34a2295b Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 3 Apr 2024 17:12:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E8=83=9C=E9=A1=B9=E7=9B=AE=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE=E4=BA=8C=E5=BC=80=201.site?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/chart/ChartDepartmentModeVO.java   | 23 ++++++++++
 .../organization/entity/chart/ChartPO.java    |  2 +
 .../service/impl/ChartServiceImpl.java        | 44 +++++++++++++++++--
 3 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 src/com/engine/organization/entity/chart/ChartDepartmentModeVO.java

diff --git a/src/com/engine/organization/entity/chart/ChartDepartmentModeVO.java b/src/com/engine/organization/entity/chart/ChartDepartmentModeVO.java
new file mode 100644
index 00000000..989942a7
--- /dev/null
+++ b/src/com/engine/organization/entity/chart/ChartDepartmentModeVO.java
@@ -0,0 +1,23 @@
+package com.engine.organization.entity.chart;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/4/2 4:22 PM
+ * @Description: 顺胜项目二开 建模虚拟部门负责人配置
+ * @Version 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChartDepartmentModeVO {
+
+    private String leaderName;
+
+    private Integer colorCheck;
+}
diff --git a/src/com/engine/organization/entity/chart/ChartPO.java b/src/com/engine/organization/entity/chart/ChartPO.java
index 7d385060..39bf4e09 100644
--- a/src/com/engine/organization/entity/chart/ChartPO.java
+++ b/src/com/engine/organization/entity/chart/ChartPO.java
@@ -34,6 +34,8 @@ public class ChartPO {
     // 部门负责人
     private String fleader;
 
+    private Integer colorCheck;
+
     // 人员主次账号
     private String belongto;
     // 人员工龄
diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index 33387242..fd722e69 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -19,6 +19,7 @@ import com.engine.organization.util.detach.DetachUtil;
 import lombok.SneakyThrows;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.docx4j.wml.U;
 import weaver.conn.RecordSet;
 import weaver.conn.RecordSetTrans;
 import weaver.general.BaseBean;
@@ -271,8 +272,18 @@ public class ChartServiceImpl extends Service implements ChartService {
             departmentChartPO.setExpand("1");
             departmentChartPO.setFisvitual(rs.getString("isvitual"));
 
-            // 部门负责人
-            departmentChartPO.setFleader(getDepartmentLeader(fLeader));
+
+            //顺胜项目二开 虚拟维度增加建模部门负责人
+            if (!isRealDimension){
+                ChartDepartmentModeVO chartDepartmentModeVO = selectModeInfo(departmentId);
+                departmentChartPO.setFleader(chartDepartmentModeVO.getLeaderName());
+                departmentChartPO.setColorCheck(chartDepartmentModeVO.getColorCheck());
+            }else {
+                // 部门负责人
+                departmentChartPO.setFleader(getDepartmentLeader(fLeader));
+            }
+
+
             dataList.add(departmentChartPO);
         }
 
@@ -1445,6 +1456,11 @@ public class ChartServiceImpl extends Service implements ChartService {
                 chartPO.setFisvitual(recordSet.getString("isvitual"));
                 chartPO.setHasChildren(getHasChildren(chartPO.getFtype(), chartPO.getFobjid()).toString());
                 chartPO.setDepartmentDepth(getDepartmentDepth(chartPO, topChartPO));
+                //顺胜二开 虚拟维度部门颜色设置
+                if (!isRealDimension && "2".equals(chartPO.getFtype())){
+                    ChartDepartmentModeVO departmentModeVO = selectModeInfo(recordSet.getString("id"));
+                    chartPO.setColorCheck(departmentModeVO.getColorCheck());
+                }
                 // 小于、等于所选层级元素展开
                 chartPO.setExpand(inDepth(selectDepth, chartPO.getDepartmentDepth()) ? "1" : "0");
                 filterAndAddData(currentList, chartPO, hideDepartment);
@@ -1703,7 +1719,29 @@ public class ChartServiceImpl extends Service implements ChartService {
                 return;
             }
         }
-
         currentList.add(chartPO);
     }
+
+
+    /**
+     * 顺胜项目 uf_xnbmfzr
+     * @param departmentId
+     * @return
+     */
+    @SneakyThrows
+    private ChartDepartmentModeVO selectModeInfo(String departmentId) {
+        RecordSet rs = new RecordSet();
+        ResourceComInfo com = new ResourceComInfo();
+        int colorCheck = 1;
+        String leaderName = null;
+        rs.executeQuery("select bmfzrid,bjtp from uf_xnbmfzr where xnzzid = ?",departmentId);
+        if (rs.next()){
+            colorCheck = Util.getIntValue(rs.getString("bjtp"),1);
+            leaderName = com.getLastname(Util.null2String(rs.getString("bmfzrid")));
+        }
+        return ChartDepartmentModeVO.builder()
+                .leaderName(leaderName)
+                .colorCheck(colorCheck)
+                .build();
+    }
 }