From 41218ebed0722bd3ce96671e1dac76b8a68c901d Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Sun, 29 Jan 2023 16:21:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=8E=A5=E5=8F=A3=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/department/bo/DepartmentBO.java    |  2 +-
 .../mapper/danikor/DanikorResourceMapper.java | 27 ++++++++++++++++++-
 .../mapper/danikor/DanikorResourceMapper.xml  | 26 +++++++++++++++++-
 .../impl/DanikorResourceBackServiceImpl.java  | 15 ++++++++---
 4 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
index 9468c5c9..4c4e66c9 100644
--- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java
+++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
@@ -143,7 +143,7 @@ public class DepartmentBO {
             tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString());
             tree.setSelected(false);
             tree.setType("2");
-            tree.setParentComp(item.getSubCompanyId1().toString());
+            tree.setParentComp(null == item.getSubCompanyId1() ? "" : item.getSubCompanyId1().toString());
             tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue());
             return tree;
         }).collect(Collectors.toList());
diff --git a/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.java b/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.java
index 363161fc..127bacfd 100644
--- a/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.java
+++ b/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.java
@@ -27,5 +27,30 @@ public interface DanikorResourceMapper {
      */
     List<TableColumnPO> getHrmColumnByTableName(@Param("tableName") String tableName);
 
-    Integer summaryData(@Param("tableName") String tableName, @Param("syncDate") String syncDate);
+    /**
+     * 汇总人员数
+     *
+     * @param tableName
+     * @param syncDate
+     * @return
+     */
+    Integer summaryResourceData(@Param("tableName") String tableName, @Param("syncDate") String syncDate);
+
+    /**
+     * 汇总分部数
+     *
+     * @param tableName
+     * @param syncDate
+     * @return
+     */
+    Integer summaryCompanyData(@Param("tableName") String tableName, @Param("syncDate") String syncDate);
+
+    /**
+     * 汇总部门数
+     *
+     * @param tableName
+     * @param syncDate
+     * @return
+     */
+    Integer summaryDepartmentData(@Param("tableName") String tableName, @Param("syncDate") String syncDate);
 }
diff --git a/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.xml b/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.xml
index 0fcd418a..b6a8a440 100644
--- a/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.xml
+++ b/src/com/engine/organization/mapper/danikor/DanikorResourceMapper.xml
@@ -41,10 +41,34 @@
             and status &lt; 4
         </if>
         <if test="tableName != 'hrmresource'">
-            isnull(canceled, '0') = '0'
+
         </if>
         <if test="syncDate != null and syncDate !=''">
             and sync_date = #{syncDate}
         </if>
     </select>
+    <select id="summaryResourceData" resultType="java.lang.Integer">
+        select count(id)
+        from ${tableName}
+        where status &lt; 4
+        <if test="syncDate != null and syncDate !=''">
+            and sync_date = #{syncDate}
+        </if>
+    </select>
+    <select id="summaryCompanyData" resultType="java.lang.Integer">
+        select count(id)
+        from ${tableName}
+        where isnull(canceled, '0') = '0'
+        <if test="syncDate != null and syncDate !=''">
+            and sync_date = #{syncDate}
+        </if>
+    </select>
+    <select id="summaryDepartmentData" resultType="java.lang.Integer">
+        select count(id)
+        from ${tableName}
+        where isnull(canceled, '0') = '0'
+        <if test="syncDate != null and syncDate !=''">
+            and sync_date = #{syncDate}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/organization/service/impl/DanikorResourceBackServiceImpl.java b/src/com/engine/organization/service/impl/DanikorResourceBackServiceImpl.java
index 76eabb96..88807437 100644
--- a/src/com/engine/organization/service/impl/DanikorResourceBackServiceImpl.java
+++ b/src/com/engine/organization/service/impl/DanikorResourceBackServiceImpl.java
@@ -134,13 +134,20 @@ public class DanikorResourceBackServiceImpl extends Service implements DanikorRe
     @Override
     public Map<String, Object> getSummaryData(Map<String, Object> params) {
         HashMap<String, Object> returnMap = new HashMap<>();
+        String companyTable = "hrmsubcompany";
+        String departmentTable = "hrmdepartment";
+        String resourceTable = "hrmresource";
         String syncDate = Util.null2String(params.get("syncDate"));
-        if (DateUtil.getDate(new Date()).equals(syncDate)) {
+        if (StringUtils.isNotBlank(syncDate) && !DateUtil.getDate(new Date()).equals(syncDate)) {
+            companyTable += "_back";
+            departmentTable += "_back";
+            resourceTable += "_back";
+        } else {
             syncDate = null;
         }
-        returnMap.put("subcompany", getDanikorResourceMapper().summaryData("hrmsubcompany", syncDate));
-        returnMap.put("department", getDanikorResourceMapper().summaryData("hrmdepartment", syncDate));
-        returnMap.put("person", getDanikorResourceMapper().summaryData("hrmresource", syncDate));
+        returnMap.put("subcompany", getDanikorResourceMapper().summaryCompanyData(companyTable, syncDate));
+        returnMap.put("department", getDanikorResourceMapper().summaryDepartmentData(departmentTable, syncDate));
+        returnMap.put("person", getDanikorResourceMapper().summaryResourceData(resourceTable, syncDate));
         return returnMap;
     }
 }