From d6888275d186432b33c32e1d7031abaeb2af5721 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Sep 2021 18:44:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmetuser/EpmetUserService.java | 8 ---- .../epmetuser/impl/EpmetUserServiceImpl.java | 41 ------------------- 2 files changed, 49 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 7819be0d10..9718ae57b2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -1,7 +1,5 @@ package com.epmet.dataaggre.service.epmetuser; -import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO; -import com.epmet.dataaggre.dto.epmetuser.form.*; import com.epmet.dataaggre.dto.epmetuser.form.*; import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; @@ -149,10 +147,4 @@ public interface EpmetUserService { */ StaffDetailV2FormDTO selectByStaffId(String staffId); - /** - * @Param formDTO - * @Description 对外接口--网格员排名-巡查记录 - * @author sun - */ - List gridMemberPatrolList(GridMemberPatrolListFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 73e7a85774..92a02290bd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -696,46 +696,5 @@ public class EpmetUserServiceImpl implements EpmetUserService { return result; } - /** - * @Param formDTO - * @Description 对外接口--网格员排名-巡查记录 - * @author sun - */ - @Override - public List gridMemberPatrolList(GridMemberPatrolListFormDTO formDTO) { - //1.查询当前组织及下级所有网格员维度对应最大dated数据【例查询2021年8月数据，则是查询8月对应的最大daeId那天的网格员数据】 - List resultList = dataStatsService.getGirdMemberPatrol(formDTO); - if (CollectionUtils.isEmpty(resultList)) { - return new ArrayList<>(); - } - - //2.按维度汇总当前组织及下级网格员巡查数据 - //【如果查询当前月或本年度数据，则需要排除最大dateId的数据，因为上边查的统计数据只有t-1的，巡查数据是t的，避免多计算了当天的巡查项目数和时长数】 - formDTO.setDateId(resultList.get(0).getDateId()); - List patrolList = staffPatrolRecordDao.gridMemberPatrol(formDTO); - - //3.以统计数据为准封装结果数据 - resultList.forEach(re -> patrolList.stream().filter(l -> re.getStaffId().equals(l.getStaffId())).forEach(s -> { - re.setReportProjectCount(s.getReportProjectCount()); - re.setPatrolTotalTime((s.getTimeNum() > NumConstant.ZERO ? s.getTimeNum() / 60 : 0)); - })); - - //4.按排序字段排序并返回 - Collections.sort(resultList, new Comparator() { - @Override - public int compare(GridMemberPatrolListResultDTO o1, GridMemberPatrolListResultDTO o2) { - if ("patrolTime".equals(formDTO.getSort())) { - return o2.getPatrolTotalTime().compareTo(o1.getPatrolTotalTime()); - } else if ("dealEvent".equals(formDTO.getSort())) { - return o2.getEventCount().compareTo(o1.getEventCount()); - } else { - return o2.getReportProjectCount().compareTo(o1.getReportProjectCount()); - } - } - }); - - return resultList; - } - }