工作实况数据

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -425,6 +425,23 @@ public class DateUtils {
         return DateUtils.format(date,DateUtils.DATE_PATTERN_YYYYMMDD);
     }
 
+    /**
+     * @return java.lang.String
+     * @param beforDay
+     * @author yinzuomei
+     * @description 获取当前日期的前n天  返回yyyyMMdd
+     * @Date 2020/6/23 1:50
+     **/
+    public static String getBeforeNDay(String dateId,int beforDay){
+        Calendar c = Calendar.getInstance();
+        if (StringUtils.isNotBlank(dateId)){
+            c.setTime(DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD));
+        }
+        c.add(Calendar.DATE, - beforDay);
+        Date date = c.getTime();
+        return DateUtils.format(date,DateUtils.DATE_PATTERN_YYYYMMDD);
+    }
+
     public static String getBeforeNDay(int beforDay,String format){
         Calendar c = Calendar.getInstance();
         c.add(Calendar.DATE, - beforDay);

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java

@@ -14,12 +14,18 @@ public class BaseStatsDataResultDTO implements Serializable {
 
     private Integer topicTotal;
     private Integer topicIncr;
+   // private Integer topicToIssueTotal;
     private Integer issueTotal;
     private Integer issueIncr;
+   // private Integer issueToProjectTotal;
     private Integer projectTotal;
     private Integer projectIncr;
     private Integer closedProjectTotal;
     private Integer closedProjectIncr;
+//    private Integer patrolTotal;
+//    private Integer patrolTotalTime;
+//    private Integer orgId;
+//    private Integer orgName;
 
 
 

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/TotalAndIncrResultDTO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * @Description 基础数据-组织各种数据汇总-接口返参
+ * @Description 总数及增量 返回结果
  * @Auth sun
  */
 @Data
@@ -16,4 +16,5 @@ public class TotalAndIncrResultDTO implements Serializable {
     private Integer incr;
     private Integer total2;
     private Integer incr2;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java

@@ -14,11 +14,13 @@ import java.io.Serializable;
 @Data
 public class WorkFactResultDTO implements Serializable {
     private static final long serialVersionUID = -8149310637601355664L;
-    private double topicToIssueTotal;
+    private Integer topicToIssueTotal = 0;
-    private double issueToProjectTotal;
+    private Integer issueToProjectTotal = 0;
-    private double closedProjectTotal;
+    private Integer closedProjectTotal = 0;
-    private double patrolTotal;
+    private Integer patrolTotal = 0;
-    private String patrolTotalTime;
+    private String patrolTotalTime = "0";
     private String orgId;
     private String orgName;
+
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java

@@ -53,9 +53,9 @@ public class PubController {
      * @date 2021/7/27 18:59
      */
     @PostMapping("subWorkFact")
-    public Result<WorkFactResultDTO> getSubWorkFact(@RequestBody BaseDataFormDTO formDTO){
+    public Result<List<WorkFactResultDTO>> getSubWorkFact(@RequestBody BaseDataFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,BaseDataFormDTO.WorkFact.class);
-        return new Result<WorkFactResultDTO>().ok(dataStatsService.getSubWorkFact(formDTO));
+        return new Result<List<WorkFactResultDTO>>().ok(dataStatsService.getSubWorkFact(formDTO));
     }
 
     /**

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java

@@ -273,4 +273,12 @@ public interface DataStatsDao {
     TotalAndIncrResultDTO getAgencySumIssue(@Param("agencyList") List<String> agencyList, @Param("dateId") String dateId);
 
     TotalAndIncrResultDTO getAgencySumProject(@Param("agencyList") List<String> agencyList, @Param("dateId") String dateId);
+
+    /**
+     * 获取话题相关总数
+     * @param agencyList
+     * @param dateId
+     * @return
+     */
+    List<BaseStatsDataResultDTO> getSubSumAgencyTopic(@Param("agencyList") List<String> agencyList, @Param("dateId") String dateId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java

@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dao.epmetuser;
+
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 工作人员巡查统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-07
+ */
+@Mapper
+public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrolRecordDailyEntity> {
+
+    /**
+     * desc:获取巡查次数和时间
+     * @param agencyList
+     * @param startDateId
+     * @param endDateId
+     * @return
+     */
+    List<StatsStaffPatrolRecordDailyEntity> getPatrolSumList(@Param("agencyList") List<String> agencyList, @Param("startDateId") String startDateId, @Param("endDateId") String endDateId);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StatsStaffPatrolRecordDailyEntity.java

@@ -0,0 +1,125 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmetuser;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * [天]工作人员巡查记录统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-29
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("stats_staff_patrol_record_daily")
+public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 来源类型 external:外部，internal:内部
+	 */
+	private String sourceType;
+
+	/**
+	 * 客户Id
+	 */
+	private String customerId;
+
+	/**
+	 * 数据来源客户Id
+	 */
+	private String sourceCustomerId;
+
+    /**
+     * 统计日期 关联日期dim表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月ID
+     */
+	private String monthId;
+
+    /**
+     * 季ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 工作人员所属组织id=网格所属的组织id
+     */
+	private String agencyId;
+
+    /**
+     * 网格所有上级id
+     */
+	private String gridPids;
+
+    /**
+     * 工作人员用户id
+     */
+	private String staffId;
+
+    /**
+     * 巡查次数
+     */
+	private Integer patrolTotal;
+
+    /**
+     * 巡查时长 单位：秒
+     */
+	private Integer totalTime;
+
+    /**
+     * 巡查期间直接立项项目数
+     */
+	private Integer reportProjectCount;
+
+	/**
+	 * 最新的巡查开始时间
+	 */
+	private Date latestPatrolTime;
+
+	/**
+	 * 最新的巡查状态 正在巡查中：patrolling；结束：end
+	 */
+	private String latestPatrolStatus;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java

@@ -182,9 +182,19 @@ public interface DataStatsService {
     */
     GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(String staffId);
 
+    /**
+     * desc:获取话题 议题 项目 关闭项目数
+     * @param formDTO
+     * @return
+     */
     BaseStatsDataResultDTO getBaseStatsData(BaseDataFormDTO formDTO);
 
-    WorkFactResultDTO getSubWorkFact(BaseDataFormDTO formDTO);
+    /**
+     * 获取工作实况中的数
+     * @param formDTO
+     * @return
+     */
+    List<WorkFactResultDTO> getSubWorkFact(BaseDataFormDTO formDTO);
 
     /**
      * @Param formDTO

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1,7 +1,8 @@
  package com.epmet.dataaggre.service.datastats.impl;
 
-import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.OrgLevelEnum;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.constant.OrgConstant;
@@ -18,7 +19,9 @@ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
+import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
+import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
 import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
 import com.epmet.dataaggre.service.opercrm.CustomerRelation;
 import com.github.pagehelper.PageHelper;
@@ -54,6 +57,8 @@ public class DataStatsServiceImpl implements DataStatsService {
 
     @Autowired
     private FactGridMemberStatisticsDailyDao factGridMemberStatisticsDailyDao;
+    @Autowired
+    private StatsStaffPatrolRecordDailyService statsStaffPatrolRecordDailyService;
 
 
     /**
@@ -1469,40 +1474,104 @@ public class DataStatsServiceImpl implements DataStatsService {
     }
 
     @Override
-    public WorkFactResultDTO getSubWorkFact(BaseDataFormDTO formDTO) {
+    public List<WorkFactResultDTO> getSubWorkFact(BaseDataFormDTO formDTO) {
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getType())){
             formDTO.setType("yesterday");
         }
+        Date yesterday = DateUtils.addDateDays(new Date(), -1);
         if (StringUtils.isBlank(formDTO.getDateId())) {
-            Date yesterday = DateUtils.addDateDays(new Date(), -1);
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
-        String startDate,endDate;
+        String startDate = null;
+        String endDate = null;
         Date dateIdDate = DateUtils.parse(formDTO.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD);
         boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId());
         switch (formDTO.getType()){
             case "yesterday":
-                startDate = DateUtils.getBeforeNDay(NumConstant.ONE);
+                startDate = DateUtils.getBeforeNDay(formDTO.getDateId(),1);
-                endDate = startDate;
+                endDate = formDTO.getDateId();
                 break;
             case "thisWeek":
                 startDate = DateUtils.getWeekStart(formDTO.getDateId());
+                startDate = DateUtils.getBeforeNDay(startDate,1);
+                DateUtils.format(DateUtils.addDateDays(yesterday, -1),DateUtils.DATE_PATTERN_YYYYMMDD);
                 if (!isYesterday){
                     endDate = DateUtils.getWeekEnd(formDTO.getDateId());
                 }
                 break;
             case "thisMonth":
                 startDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD);
+                startDate = DateUtils.getBeforeNDay(startDate,1);
                 if (!isYesterday) {
                     endDate = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD);
                 }
+                break;
+            default:
+                log.warn("===========");
         }
+        formDTO.setStartDateId(startDate);
+        formDTO.setEndDateId(endDate);
+        List<WorkFactResultDTO> result = new ArrayList<>();
+        //如果是社区 则下级是网格 查询网格的数据
+        if (OrgLevelEnum.COMMUNITY.getCode().equals(formDTO.getAgencyLevel())){
 
+        }else {
+            //0.根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表
+            List<ScreenCustomerAgencyDTO> subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
+            if (subAgencyList.size() < NumConstant.ONE) {
+                return null;
+            }
+
+            List<String> agencyList = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
+            //查询组织的话题转议题数据
+            List<SubAgencyFormDTO.Topic> toIssueStart = dataStatsDao.getSubAgencyTopicShiftIssue(agencyList, formDTO.getStartDateId());
+            List<SubAgencyFormDTO.Topic> toIssueEnd = dataStatsDao.getSubAgencyTopicShiftIssue(agencyList, formDTO.getEndDateId());
+            Map<String, Integer> toIssueStartMap = toIssueStart.stream().collect(Collectors.toMap(SubAgencyFormDTO.Topic::getAgencyId, SubAgencyFormDTO.Topic::getShiftedIssueTotal, (o1, o2) -> o1));
+            Map<String, Integer> toIssueEndMap = toIssueEnd.stream().collect(Collectors.toMap(SubAgencyFormDTO.Topic::getAgencyId, SubAgencyFormDTO.Topic::getShiftedIssueTotal, (o1, o2) -> o1));
+            //查询组织的议题转项目数据
+            List<SubAgencyIssueResultDTO> toProjectStart = dataStatsDao.getSubAgencyIssue(agencyList, formDTO.getStartDateId());
+            List<SubAgencyIssueResultDTO> toProjectEnd = dataStatsDao.getSubAgencyIssue(agencyList, formDTO.getEndDateId());
+            Map<String, Integer> toProjectStartMap = toProjectStart.stream().collect(Collectors.toMap(SubAgencyIssueResultDTO::getAgencyId, SubAgencyIssueResultDTO::getShiftProjectTotal, (o1, o2) -> o1));
+            Map<String, Integer> toProjectEndMap = toProjectEnd.stream().collect(Collectors.toMap(SubAgencyIssueResultDTO::getAgencyId, SubAgencyIssueResultDTO::getShiftProjectTotal, (o1, o2) -> o1));
+            //查询组织已关闭的项目数据
+            List<SubAgencyProjectResultDTO> closeProjectStart = dataStatsDao.getSubAgencyProject(agencyList, formDTO.getStartDateId());
+            List<SubAgencyProjectResultDTO> closeProjectEnd = dataStatsDao.getSubAgencyProject(agencyList, formDTO.getEndDateId());
+            Map<String, Integer> closeProjectStartMap = closeProjectStart.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
+            Map<String, Integer> closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
+            //巡查次数和时间
+            List<StatsStaffPatrolRecordDailyEntity> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyList,formDTO.getStartDateId(),formDTO.getEndDateId());
+            Map<String, StatsStaffPatrolRecordDailyEntity> patrolListMap = patrolList.stream().collect(Collectors.toMap(StatsStaffPatrolRecordDailyEntity::getAgencyId, o -> o, (o1, o2) -> o1));
+
+            subAgencyList.forEach(agency->{
+                String agencyId = agency.getAgencyId();
+                WorkFactResultDTO resultDTO = new WorkFactResultDTO();
+                resultDTO.setOrgId(agencyId);
+                resultDTO.setOrgName(agency.getAgencyName());
+                resultDTO.setTopicToIssueTotal(getTotal(toIssueStartMap,toIssueEndMap,agencyId));
+                resultDTO.setIssueToProjectTotal(getTotal(toProjectStartMap,toProjectEndMap,agencyId));
+                resultDTO.setClosedProjectTotal(getTotal(closeProjectStartMap,closeProjectEndMap,agencyId));
+                StatsStaffPatrolRecordDailyEntity patrolRecordDTO = patrolListMap.get(agencyId);
+                if (patrolRecordDTO != null){
+                    resultDTO.setPatrolTotal(patrolRecordDTO.getPatrolTotal());
+                    Integer totalTime = patrolRecordDTO.getTotalTime();
+                    resultDTO.setPatrolTotalTime(totalTime.toString());
+                }
+                result.add(resultDTO);
+            });
+        }
 
 
-        return null;
+        return result;
+    }
+    private Integer getTotal(Map<String,Integer> startMap, Map<String,Integer> endMap,String agencyId){
+        Integer total1 = startMap.getOrDefault(agencyId,NumConstant.ZERO);
+        Integer total2 = endMap.getOrDefault(agencyId,NumConstant.ZERO);
+        if (total1.equals(total2)){
+            log.warn("===========相等,total:{}",total1);
+        }
+        return Math.max(total2-total1,0);
     }
 
     private String getPercentage(Integer countInt, Integer totalInt) {

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.service.epmetuser;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
+
+import java.util.List;
+
+/**
+ * 工作人员巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-07
+ */
+public interface StatsStaffPatrolRecordDailyService extends BaseService<StatsStaffPatrolRecordDailyEntity> {
+
+    /**
+     * desc:获取组织或网格的 时间段内的总次数等
+	 * @param agencyList
+     * @param startDateId
+     * @param endDateId
+     * @return
+     */
+	List<StatsStaffPatrolRecordDailyEntity> getPatrolSumList(List<String> agencyList, String startDateId, String endDateId);
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java

@@ -0,0 +1,43 @@
+package com.epmet.dataaggre.service.epmetuser.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.epmetuser.StatsStaffPatrolRecordDailyDao;
+import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
+import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * desc:
+ *
+ * @author: LiuJanJun
+ * @date: 2021/8/6 11:06 上午
+ * @version: 1.0
+ */
+@DataSource(DataSourceConstant.EPMET_USER)
+@Slf4j
+@Service
+public class StatsStaffPatrolRecordDailyServiceImpl extends BaseServiceImpl<StatsStaffPatrolRecordDailyDao, StatsStaffPatrolRecordDailyEntity> implements StatsStaffPatrolRecordDailyService {
+    /**
+     * desc:获取组织或网格的 时间段内的总次数等
+     *
+     * @param agencyList
+     * @param startDateId
+     * @param endDateId
+     * @return
+     */
+    @Override
+    public List<StatsStaffPatrolRecordDailyEntity> getPatrolSumList(List<String> agencyList, String startDateId, String endDateId) {
+       /* LambdaQueryWrapper<StatsStaffPatrolRecordDailyEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StatsStaffPatrolRecordDailyEntity::getDelFlag, NumConstant.ZERO_STR)
+                .between(StatsStaffPatrolRecordDailyEntity::getDateId, startDateId,endDateId)
+                .in(StatsStaffPatrolRecordDailyEntity::getAgencyId, agencyList)
+                ;*/
+        return baseDao.getPatrolSumList(agencyList,startDateId,endDateId);
+    }
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -727,5 +727,20 @@
             agency_id = #{agencyId}
         </foreach>
     </select>
+    <select id="getSubSumAgencyTopic" resultType="com.epmet.dataaggre.dto.datastats.result.BaseStatsDataResultDTO">
+        SELECT
+            agency_id AS agencyId,
+            topic_count AS topicCount,
+            topic_status_id AS topicStatus
+        FROM
+        fact_topic_status_agency_daily
+        WHERE
+        del_flag = '0'
+        AND topic_status_id in('discussing','closed','hidden')<!-- 讨论中(热议中！=讨论中)、已处理、已屏蔽 -->
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+    </select>
 
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.epmet.dataaggre.dao.epmetuser.StatsStaffPatrolRecordDailyDao">
+    <select id="getPatrolSumList" resultType="com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity">
+        SELECT
+            agency_id,
+            sum(patrol_total) patrolTotal,
+            sum(TOTAL_TIME) totalTime
+        FROM stats_staff_patrol_record_daily
+        WHERE del_flag = '0'
+        AND date_id BETWEEN #{startDateId} and #{endDateId}
+        <foreach item="agencyId" collection="agencyList" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+        GROUP BY customer_id,agency_id
+    </select>
+</mapper>