铭沣科技统计分析门户接口 饼图 柱状图 接口封版

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<String> 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<String> allSubDepartment = new ArrayList<>();
+            comInfo.getAllChildDeptByDepId(allSubDepartment, String.valueOf(deptid));
+            if (CollectionUtils.isNotEmpty(allSubDepartment)) {
+                int count = countBydeptIds(StringUtils.join(allSubDepartment,","));
                 num = num + count;
             }
 

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<String> a = new TreeSet<>();
-       a.add("和平");
-        a.add("阿姨");
-        a.add("测试");
-        for (String string : a) {
-            System.out.println(string);
-        }
+        DepartmentComInfo departmentComInfo = new DepartmentComInfo();
+
+
     }
 
 }