From ffc755d06cc13a2f2623de9da64577c2a7f6ca00 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 13 Oct 2023 17:55:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=AD=E6=B2=A3=E7=A7=91=E6=8A=80=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=86=E6=9E=90=E9=97=A8=E6=88=B7=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=20=E9=A5=BC=E5=9B=BE=20=E6=9F=B1=E7=8A=B6=E5=9B=BE=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=B0=81=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StatisticsPortalServiceImpl.java | 15 ++++++++++----- src/test/MainTest.java | 11 ++++------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/com/engine/matfron/service/impl/StatisticsPortalServiceImpl.java b/src/com/engine/matfron/service/impl/StatisticsPortalServiceImpl.java index 595199d..de10e52 100644 --- a/src/com/engine/matfron/service/impl/StatisticsPortalServiceImpl.java +++ b/src/com/engine/matfron/service/impl/StatisticsPortalServiceImpl.java @@ -8,6 +8,7 @@ import com.engine.matfron.util.CommonDateUtil; import com.engine.matfron.util.CommonUtils; import com.weaver.general.BaseBean; import lombok.SneakyThrows; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.Util; @@ -43,7 +44,10 @@ public class StatisticsPortalServiceImpl extends Service implements StatisticsPo rs.next(); Integer count = Util.getIntValue(rs.getString("count"), 0); portalTopVOList.add(PortalTopVO.builder().title("在职人数总数").count(count).build()); - portalTopVOList.add(PortalTopVO.builder().title("社保缴纳人数").count(0).build()); + + rs.executeQuery("select count(1) as sum from hrsa_insurance_base_info where run_status in (2,3) and delete_type = 0"); + rs.next(); + portalTopVOList.add(PortalTopVO.builder().title("社保缴纳人数").count(Util.getIntValue(rs.getString("sum"), 0)).build()); List birthdayList = new ArrayList<>(); rs.executeQuery("select birthday from hrmresource where status < 4 and birthday is not null and birthday <> ''"); @@ -91,10 +95,11 @@ public class StatisticsPortalServiceImpl extends Service implements StatisticsPo while (rs.next()) { int deptid = Util.getIntValue(rs.getString("id")); int num = Util.getIntValue(rs.getString("num")); - String allSupDepartment; - allSupDepartment = comInfo.getAllSupDepartment(String.valueOf(deptid)); - if (StringUtils.isNotEmpty(allSupDepartment)) { - int count = countBydeptIds(allSupDepartment); + + ArrayList allSubDepartment = new ArrayList<>(); + comInfo.getAllChildDeptByDepId(allSubDepartment, String.valueOf(deptid)); + if (CollectionUtils.isNotEmpty(allSubDepartment)) { + int count = countBydeptIds(StringUtils.join(allSubDepartment,",")); num = num + count; } diff --git a/src/test/MainTest.java b/src/test/MainTest.java index 4366487..b40642b 100644 --- a/src/test/MainTest.java +++ b/src/test/MainTest.java @@ -3,6 +3,7 @@ package test; import com.engine.matfron.entity.SurnameParam; import com.engine.matfron.util.CommonDateUtil; import emo.doors.b; +import weaver.hrm.company.DepartmentComInfo; import java.time.LocalDate; import java.time.YearMonth; @@ -19,13 +20,9 @@ public class MainTest { public static void main(String[] args) { - TreeSet a = new TreeSet<>(); - a.add("和平"); - a.add("阿姨"); - a.add("测试"); - for (String string : a) { - System.out.println(string); - } + DepartmentComInfo departmentComInfo = new DepartmentComInfo(); + + } }