例行工作数字

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

@@ -19,6 +19,7 @@ public class WorkFactResultDTO implements Serializable {
     private Integer closedProjectTotal = 0;
     private Integer patrolTotal = 0;
     private String patrolTotalTime = "0";
+    private Integer routineWorkCount = 0;
     private String orgId;
     private String orgName;
 

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDailySumResult.java

@@ -18,4 +18,5 @@ public class PatrolDailySumResult implements Serializable {
     private String orgId;
     private Integer patrolTotal;
     private Integer totalTime;
+    private Integer routineWorkCount;
 }

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

@@ -3,12 +3,10 @@
  import com.alibaba.fastjson.JSON;
 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.enums.OrgLevelEnum;
- import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
- import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.feign.ResultDataResolver;
- import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
- import com.epmet.commons.tools.feign.ResultDataResolver;
- import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
@@ -26,22 +24,18 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
- import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
- import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO;
+import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
- 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.govorg.CustomerAgencyEntity;
+import com.epmet.dataaggre.excel.CustomerDataManageExcel;
- import com.epmet.dataaggre.excel.CustomerDataManageExcel;
 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.govorg.GovOrgService;
+import com.epmet.dataaggre.service.govorg.GovOrgService;
- import com.epmet.dataaggre.service.opercrm.CustomerRelation;
+import com.epmet.dataaggre.service.opercrm.CustomerRelation;
- import com.epmet.dto.CustomerAgencyDTO;
+import com.github.pagehelper.PageHelper;
- import com.epmet.feign.GovOrgOpenFeignClient;
- import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -1636,6 +1630,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
 
     private void setPatrolAttr(WorkFactResultDTO resultDTO, PatrolDailySumResult patrolRecordDTO) {
         if (patrolRecordDTO != null){
+            resultDTO.setRoutineWorkCount(patrolRecordDTO.getRoutineWorkCount());
             resultDTO.setPatrolTotal(patrolRecordDTO.getPatrolTotal());
             Integer totalTime = patrolRecordDTO.getTotalTime();
             if (totalTime != null || totalTime > 0){

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

@@ -6,7 +6,8 @@
         SELECT
             #{orgId} orgId,
             sum(patrol_total) patrolTotal,
-            sum(TOTAL_TIME) totalTime
+            sum(TOTAL_TIME) totalTime,
+            sum(ROUTINE_WORK_COUNT) routineWorkCount
         FROM stats_staff_patrol_record_daily
         WHERE del_flag = '0'
         AND date_id <![CDATA[>=]]> #{startDateId}