From 260df9c156b9822ac113db16abbfa0a287dacee5 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 7 Aug 2024 16:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=A7=91=E8=AE=AF=E9=80=9A=E8=AE=AF?=
 =?UTF-8?q?=E5=BD=95=E5=9C=A8=E8=81=8C=E4=BA=BA=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  2 --
 src/META-INF/MANIFEST.MF                      |  3 ---
 src/com/api/hrm/service/HrmTreeService.java   | 27 +++++++++++++++++++
 .../akx/cronjob/PersonStatisticsCron.java     |  1 -
 .../akx/cronjob}/PersonStatisticsPo.java      |  2 +-
 5 files changed, 28 insertions(+), 7 deletions(-)
 delete mode 100644 src/META-INF/MANIFEST.MF
 rename src/{com/engine/entity => weaver/interfaces/akx/cronjob}/PersonStatisticsPo.java (91%)

diff --git a/.gitignore b/.gitignore
index 71a7a3f..19b83a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,6 @@
 HELP.md
 target/
 
-.idea
-
 /test
 /src/rebel.xml
 /src/META-INF
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
deleted file mode 100644
index c6a0d1a..0000000
--- a/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: test.MainTest
-
diff --git a/src/com/api/hrm/service/HrmTreeService.java b/src/com/api/hrm/service/HrmTreeService.java
index f671f22..f319511 100644
--- a/src/com/api/hrm/service/HrmTreeService.java
+++ b/src/com/api/hrm/service/HrmTreeService.java
@@ -272,7 +272,17 @@ public class HrmTreeService extends BaseBean{
 			orgBean.setIcon("icon-coms-LargeArea");
 			orgBean.setCanceled("1".equals(rs.getCompanyiscanceled()));
 			//orgBean.setCanClick(!this.isLoadSubDepartment);
+
+			//安科讯二开增加人数统计分部
+			RecordSet rst = new RecordSet();
+			rst.executeQuery("select rstj from hrmsubcompanydefined where subcomid = ?",id);
+			rst.next();
+			Integer rstj = Util.getIntValue(rst.getString("rstj"),0);
+			orgBean.setCount(rstj);
+
 			orgBean.setCanClick(isOrgTree);
+
+
 			if(!this.isLoadSubDepartment){
 				orgBean.setTitle(getAllParentsOrg(id,"0"));
 			}
@@ -481,6 +491,13 @@ public class HrmTreeService extends BaseBean{
 			orgBean.setTitle(getAllParentsOrg(id,"1"));
 			orgBean.setPsubcompanyid(pSubCompany.getId());
 			orgBean.setIcon("icon-coms-Branch");
+
+			//安科讯二开增加人数统计部门
+			RecordSet rst = new RecordSet();
+			rst.executeQuery("select rstj from hrmdepartmentdefined where deptid = ?",id);
+			rst.next();
+			Integer rstj = Util.getIntValue(rst.getString("rstj"),0);
+			orgBean.setCount(rstj);
 			
 			pSubCompany.setIsParent(true);
 			if (pDepartment != null) {
@@ -1118,6 +1135,16 @@ public class HrmTreeService extends BaseBean{
 		private String displayType;
 		private boolean isCanceled;
 		private String requestParams;//头像信息
+		private Integer count; //安科讯二开人数统计
+
+		public Integer getCount() {
+			return count;
+		}
+
+		public void setCount(Integer count) {
+			this.count = count;
+		}
+
 
 		public String getCompanyid() {
 			return companyid;
diff --git a/src/weaver/interfaces/akx/cronjob/PersonStatisticsCron.java b/src/weaver/interfaces/akx/cronjob/PersonStatisticsCron.java
index 0addc46..c1983a2 100644
--- a/src/weaver/interfaces/akx/cronjob/PersonStatisticsCron.java
+++ b/src/weaver/interfaces/akx/cronjob/PersonStatisticsCron.java
@@ -1,7 +1,6 @@
 package weaver.interfaces.akx.cronjob;
 
 import cn.hutool.core.thread.ThreadUtil;
-import com.engine.entity.PersonStatisticsPo;
 import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
diff --git a/src/com/engine/entity/PersonStatisticsPo.java b/src/weaver/interfaces/akx/cronjob/PersonStatisticsPo.java
similarity index 91%
rename from src/com/engine/entity/PersonStatisticsPo.java
rename to src/weaver/interfaces/akx/cronjob/PersonStatisticsPo.java
index c594ddc..988e5cd 100644
--- a/src/com/engine/entity/PersonStatisticsPo.java
+++ b/src/weaver/interfaces/akx/cronjob/PersonStatisticsPo.java
@@ -1,4 +1,4 @@
-package com.engine.entity;
+package weaver.interfaces.akx.cronjob;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;