统计接口fix

songhuangfeng123

2022-09-07 471e7d6d238e22308e0457aa03c8f8ff62cd6340

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java

@@ -50,6 +50,7 @@
        incidentManageCountRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
        incidentManageCountRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
        incidentManageCountRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
        incidentManageCountRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());

        getSingleTimeData(incidentManageCountRPCResp, query);

@@ -81,6 +82,7 @@
            incidentManageCountRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
            incidentManageCountRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
            incidentManageCountRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
            incidentManageCountRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());

            getSingleTimeData(incidentManageCountRPCResp, query);
            list.add(incidentManageCountRPCResp);
@@ -108,13 +110,16 @@
        Long deptId = incidentManageRPCResp.getDeptId();
        String startTime;
        String endTime;
        Integer distType;
        if (query.getMonth() == null) {
            distType=1;
            // 查该年度12个月份的
            startTime = TimeUtils.getYearFirst(query.getYear());
            endTime = TimeUtils.getYearLast(query.getYear());
            accidentReportCountRPCList= accidentReportInfoService.getCountForRPCByDeptIdAndMonth(startTime, endTime, deptId);

        } else {
            distType=2;
            // 查该年度指定月份的
            startTime = TimeUtils.getMonthFirst(query.getYear(), query.getMonth());
            endTime = TimeUtils.getMonthLast(query.getYear(), query.getMonth());
@@ -129,6 +134,16 @@
            for (Integer integer : timeSET) {
                IncidentManageCountRPCResp incidentManageCountRPCResp = new IncidentManageCountRPCResp();
                incidentManageCountRPCResp.setTime(integer);
                incidentManageCountRPCResp.setYear(query.getYear());
                incidentManageCountRPCResp.setDistType(distType);
                if (distType==1){
                    incidentManageCountRPCResp.setMonth(integer);
                }
                if (distType==2){
                    incidentManageCountRPCResp.setMonth(query.getMonth());
                    incidentManageCountRPCResp.setDay(integer);
                }

                incidentManageCountRPCResp.setDetail(new ArrayList<>());
                resList.add(incidentManageCountRPCResp);
            }