Merge remote-tracking branch 'remotes/origin/dev_routine_work' into develop

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

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

@@ -122,4 +122,9 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity {
 	 */
 	private String latestPatrolStatus;
 
+	/**
+	 * 例行工作次数
+	 */
+	private Integer routineWorkCount;
+
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/StatsStaffPatrolRecordDailyDTO.java

@@ -124,6 +124,11 @@ public class StatsStaffPatrolRecordDailyDTO implements Serializable {
      */
 	private String latestPatrolStatus;
 
+	/**
+	 * 例行工作次数
+	 */
+	private Integer routineWorkCount;
+
     /**
      * 删除标识 0.未删除 1.已删除
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -81,6 +81,7 @@ public interface ProjectConstant {
      * 项目来源于 工作端立项
      */
     String PROJECT_ORIGIN_AGENCY="agency";
+
     String PROJECT_ORIGIN_EVENT="resi_event";
     /**
      * 自办

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java

@@ -3,6 +3,7 @@ package com.epmet.dao.user;
 import com.epmet.dto.extract.form.GridHeartedFormDTO;
 import com.epmet.dto.extract.form.StaffPatrolStatsFormDTO;
 import com.epmet.dto.extract.result.UserPartyResultDTO;
+import com.epmet.dto.result.PatrolRoutineWorkResult;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.form.GmUploadEventFormDTO;
 import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
@@ -35,14 +36,14 @@ public interface UserDao {
     CommonTotalAndIncCountResultDTO selectResiTotalAndIncrByLevel(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate);
 
     /**
-     * @Description  查询注册用户的总量与增量【新方法】
+     * @Description 查询注册用户的总量与增量【新方法】
      * @Param regOrPartiFlag
      * @Param gridIds
      * @Param targetDate
      * @author zxc
      * @date 2021/7/27 10:20 上午
      */
-    List<TotalAndIncrResultDTO> selectResiTotalAndIncrByGridIds(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate,@Param("startDate")Date startDate);
+    List<TotalAndIncrResultDTO> selectResiTotalAndIncrByGridIds(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate, @Param("startDate") Date startDate);
 
     /**
      * @param
@@ -54,13 +55,13 @@ public interface UserDao {
     CommonTotalAndIncCountResultDTO selectPartyTotalAndIncr(@Param("userIds") List<String> userIds, @Param("incrUserIds") List<String> incrUserIds, @Param("targetDate") Date targetDate);
 
     /**
-     * @Description  查询党员的总量与增量【新方法】
+     * @Description 查询党员的总量与增量【新方法】
      * @Param targetDate
      * @Param regOrPartiFlag
      * @author zxc
      * @date 2021/7/27 5:08 下午
      */
-    List<PartyTotalAndIncrResultDTO> selectPartyTotalAndIncrNew(@Param("targetDate") Date targetDate,@Param("regOrPartiFlag") String regOrPartiFlag,@Param("startDate") Date startDate);
+    List<PartyTotalAndIncrResultDTO> selectPartyTotalAndIncrNew(@Param("targetDate") Date targetDate, @Param("regOrPartiFlag") String regOrPartiFlag, @Param("startDate") Date startDate);
 
     /**
      * @param
@@ -72,7 +73,7 @@ public interface UserDao {
     CommonTotalAndIncCountResultDTO selectWarmTotalAndIncr(@Param("userIds") List<String> userIds, @Param("incrUserIds") List<String> incrUserIds, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate);
 
     /**
-     * @Description  查询热心居民的总量与增量【新方法】
+     * @Description 查询热心居民的总量与增量【新方法】
      * @Param userIds 总注册用户
      * @Param incrUserIds  增长注册用户
      * @Param gridIds  网格IDS
@@ -81,7 +82,7 @@ public interface UserDao {
      * @date 2021/7/27 1:31 下午
      */
     List<WarmTotalAndIncrResultDTO> selectWarmTotalAndIncrByGrids(@Param("userIds") List<String> userIds, @Param("incrDailyUserIds") List<String> incrDailyUserIds, @Param("gridIds") Set<String> gridIds,
-                                                                  @Param("targetDate") Date targetDate,@Param("startDate") Date startDate,@Param("incrMonthlyUserIds") List<String> incrMonthlyUserIds);
+                                                                  @Param("targetDate") Date targetDate, @Param("startDate") Date startDate, @Param("incrMonthlyUserIds") List<String> incrMonthlyUserIds);
 
     /**
      * @param
@@ -102,7 +103,7 @@ public interface UserDao {
     List<String> selectTotalUserIds(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate);
 
     /**
-     * @Description  查询指定网格范围下单位时间内新增的注册用户Id【新方法】
+     * @Description 查询指定网格范围下单位时间内新增的注册用户Id【新方法】
      * @Param regOrPartiFlag
      * @Param gridIds
      * @Param targetDate
@@ -110,10 +111,10 @@ public interface UserDao {
      * @date 2021/7/27 10:41 上午
      */
     List<IncrAndTotalUserIdsResultDTO> selectIncrUserIdsByGrids(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("targetDate") Date targetDate,
-                                                                @Param("startDate")Date startDate);
+                                                                @Param("startDate") Date startDate);
 
     /**
-     * @Description  查询指定网格范围下单位时间内全部的注册用户Id【新方法】
+     * @Description 查询指定网格范围下单位时间内全部的注册用户Id【新方法】
      * @Param regOrPartiFlag
      * @Param gridIds
      * @Param targetDate
@@ -141,7 +142,7 @@ public interface UserDao {
     Integer selectResiIncrWithinTimeRange(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set<String> gridIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
 
     /**
-     * @Description  查询指定时间范围内注册/参与用户增量【新方法】
+     * @Description 查询指定时间范围内注册/参与用户增量【新方法】
      * @Param regOrPartiFlag
      * @Param gridIds
      * @Param startDate
@@ -266,5 +267,7 @@ public interface UserDao {
     List<MidPatrolDetailResult> getPatrolDetailList(MidPatrolFormDTO formDTO);
 
     List<String> filterUserIds(@Param("userIds") List<String> userIds, @Param("roleKey") String roleKey);
+
+    List<PatrolRoutineWorkResult> selectRoutineWorkListByDateId(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java

@@ -123,5 +123,10 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity {
 	 */
 	private String latestPatrolStatus;
 
+	/**
+	 * 例行工作次数
+	 */
+	private Integer routineWorkCount;
+
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java

@@ -8,6 +8,7 @@ import com.epmet.constant.ProjectConstant;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.extract.form.BizDataFormDTO;
 import com.epmet.dto.extract.form.StaffPatrolStatsFormDTO;
+import com.epmet.dto.result.PatrolRoutineWorkResult;
 import com.epmet.dto.user.result.CustomerGridStaffDTO;
 import com.epmet.dto.user.result.CustomerStaffDTO;
 import com.epmet.dto.user.result.StaffPatrolRecordResult;
@@ -128,25 +129,29 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
         //获取昨日的立项项目数
         List<ProjectDTO> yesterdayProjectList = projectService.selectProjectListByDateId(formDTO.getCustomerId(), formDTO.getDateId(), ProjectConstant.PROJECT_ORIGIN_AGENCY);
 
+        //获取昨日的例行工作数据
+        List<PatrolRoutineWorkResult> yesterdayWorkList = userService.selectRoutineWorkListByDateId(formDTO.getCustomerId(), formDTO.getDateId());
+
         //遍历网格员 设置其 巡查次数 巡查时常 上报项目数
         yesterdayPatrolList.forEach(patrolRecord -> {
             String key = patrolRecord.getGrid().concat(patrolRecord.getStaffId());
             StatsStaffPatrolRecordDailyDTO patrolRecordDailyDTO = yesterdayStatsMap.get(key);
-            if (patrolRecordDailyDTO != null) {
+            if (patrolRecordDailyDTO == null) {
-                long total = (patrolRecord.getPatrolEndTime().getTime() - patrolRecord.getPatrolStartTime().getTime()) / 1000;
+                return;
-                if (patrolRecordDailyDTO.getTotalTime() == null) {
+            }
-                    patrolRecordDailyDTO.setTotalTime(NumConstant.ZERO);
+            long total = (patrolRecord.getPatrolEndTime().getTime() - patrolRecord.getPatrolStartTime().getTime()) / NumConstant.ONE_THOUSAND;
-                }
+            if (patrolRecordDailyDTO.getTotalTime() == null) {
-                patrolRecordDailyDTO.setTotalTime(patrolRecordDailyDTO.getTotalTime() + (int) total);
+                patrolRecordDailyDTO.setTotalTime(NumConstant.ZERO);
-                if (patrolRecordDailyDTO.getPatrolTotal() == null) {
+            }
-                    patrolRecordDailyDTO.setPatrolTotal(NumConstant.ZERO);
+            patrolRecordDailyDTO.setTotalTime(patrolRecordDailyDTO.getTotalTime() + (int) total);
-                }
+            if (patrolRecordDailyDTO.getPatrolTotal() == null) {
-                patrolRecordDailyDTO.setPatrolTotal(patrolRecordDailyDTO.getPatrolTotal() + NumConstant.ONE);
+                patrolRecordDailyDTO.setPatrolTotal(NumConstant.ZERO);
-                //如果巡查记录时间小于统计里的最新的时间 则更新
+            }
-                if (patrolRecordDailyDTO.getLatestPatrolTime() == null || patrolRecordDailyDTO.getLatestPatrolTime().getTime() < patrolRecord.getPatrolStartTime().getTime()) {
+            patrolRecordDailyDTO.setPatrolTotal(patrolRecordDailyDTO.getPatrolTotal() + NumConstant.ONE);
-                    patrolRecordDailyDTO.setLatestPatrolTime(patrolRecord.getPatrolStartTime());
+            //如果巡查记录时间小于统计里的最新的时间 则更新
-                    patrolRecordDailyDTO.setLatestPatrolStatus(patrolRecord.getStatus());
+            if (patrolRecordDailyDTO.getLatestPatrolTime() == null || patrolRecordDailyDTO.getLatestPatrolTime().getTime() < patrolRecord.getPatrolStartTime().getTime()) {
-                }
+                patrolRecordDailyDTO.setLatestPatrolTime(patrolRecord.getPatrolStartTime());
+                patrolRecordDailyDTO.setLatestPatrolStatus(patrolRecord.getStatus());
             }
         });
         //填充项目数
@@ -164,10 +169,19 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
                         return;
                     }
 
-                    recordDailyDTO.setReportProjectCount(recordDailyDTO.getReportProjectCount() + 1);
+                    recordDailyDTO.setReportProjectCount(recordDailyDTO.getReportProjectCount() + NumConstant.ONE);
                 }
             });
         });
+        yesterdayWorkList.forEach(work->{
+            String key = work.getGridId().concat(work.getUserId());
+            StatsStaffPatrolRecordDailyDTO patrolRecordDailyDTO = yesterdayStatsMap.get(key);
+            if (patrolRecordDailyDTO == null){
+                return;
+            }
+            patrolRecordDailyDTO.setRoutineWorkCount(patrolRecordDailyDTO.getRoutineWorkCount() + NumConstant.ONE);
+
+        });
 
         Integer effectRow = statsStaffPatrolService.delAndInsertBatch(formDTO, insertList);
         log.debug("initStaffPatrolStats insert rows:{}", effectRow);
@@ -227,6 +241,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
             record.setPatrolTotal(NumConstant.ZERO);
             record.setLatestPatrolStatus("end");
             record.setReportProjectCount(NumConstant.ZERO);
+            record.setRoutineWorkCount(NumConstant.ZERO);
 
             record.setSourceType("internal");
             record.setSourceCustomerId(record.getCustomerId());

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java

@@ -4,6 +4,7 @@ import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.extract.form.GridHeartedFormDTO;
 import com.epmet.dto.extract.form.StaffPatrolStatsFormDTO;
 import com.epmet.dto.org.result.OrgStaffDTO;
+import com.epmet.dto.result.PatrolRoutineWorkResult;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.form.GmUploadEventFormDTO;
 import com.epmet.dto.stats.user.result.UserStatisticalData;
@@ -146,6 +147,14 @@ public interface UserService {
     List<MidPatrolRecordResult> getPatrolRecordList(MidPatrolFormDTO formDTO);
 
     List<MidPatrolDetailResult> getPatrolDetailList(MidPatrolFormDTO formDTO);
-    
+
     List<String> filterUserIds(List<String> userIds, String roleKey);
+
+    /**
+     * desc:根据客户id和日期获取 例行工作数据
+     * @param customerId
+     * @param dateId
+     * @return
+     */
+    List<PatrolRoutineWorkResult> selectRoutineWorkListByDateId(String customerId, String dateId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/StatsStaffPatrolServiceImpl.java

@@ -13,6 +13,7 @@ import com.epmet.service.user.StatsStaffPatrolService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -30,6 +31,7 @@ public class StatsStaffPatrolServiceImpl implements StatsStaffPatrolService {
     @Autowired
     private StatsStaffPatrolRecordDailyDao statsStaffPatrolRecordDailyDao;
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Integer delAndInsertBatch(StaffPatrolStatsFormDTO formDTO, List<StatsStaffPatrolRecordDailyDTO> insertList) {
         int delete = statsStaffPatrolRecordDailyDao.deleteInternal(formDTO);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java

@@ -13,6 +13,7 @@ import com.epmet.dto.extract.form.GridHeartedFormDTO;
 import com.epmet.dto.extract.form.StaffPatrolStatsFormDTO;
 import com.epmet.dto.extract.result.UserPartyResultDTO;
 import com.epmet.dto.org.result.OrgStaffDTO;
+import com.epmet.dto.result.PatrolRoutineWorkResult;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.form.GmUploadEventFormDTO;
 import com.epmet.dto.stats.user.*;
@@ -1113,4 +1114,16 @@ public class UserServiceImpl implements UserService {
     public List<String> filterUserIds(List<String> userIds, String roleKey) {
         return userDao.filterUserIds(userIds, roleKey);
     }
+
+    /**
+     * desc:根据客户id和日期获取 例行工作数据
+     *
+     * @param customerId
+     * @param dateId
+     * @return
+     */
+    @Override
+    public List<PatrolRoutineWorkResult> selectRoutineWorkListByDateId(String customerId, String dateId) {
+        return userDao.selectRoutineWorkListByDateId(customerId, dateId);
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/StatsStaffPatrolRecordDailyDao.xml

@@ -23,6 +23,7 @@
             REPORT_PROJECT_COUNT,
             LATEST_PATROL_TIME,
             LATEST_PATROL_STATUS,
+            ROUTINE_WORK_COUNT,
             DEL_FLAG,
             REVISION,
             CREATED_BY,
@@ -50,6 +51,7 @@
             #{item.reportProjectCount},
             #{item.latestPatrolTime},
             #{item.latestPatrolStatus},
+            #{item.routineWorkCount},
             '0',
             0,
             'APP_USER',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

@@ -620,7 +620,7 @@
     </select>
     <select id="selectStaffPatrolListByDateId" resultType="com.epmet.dto.user.result.StaffPatrolRecordResult">
        SELECT
-            r.*
+            r.ID, CUSTOMER_ID, GRID, GRID_PIDS, STAFF_ID, AGENCY_ID, PATROL_START_TIME, PATROL_END_TIME, ACTRUAL_END_TIME, TOTAL_TIME, STATUS, IS_HAND_END, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME
         FROM
             staff_patrol_record r
         WHERE
@@ -1065,5 +1065,13 @@
           </foreach>
             and er.ROLE_KEY = #{roleKey}
     </select>
+    <select id="selectRoutineWorkListByDateId" resultType="com.epmet.dto.result.PatrolRoutineWorkResult">
+        SELECT id, GRID_ID,USER_ID FROM patrol_routine_work
+        WHERE
+        DATE_FORMAT( CREATED_TIME, '%Y%m%d' ) = #{dateId}
+        AND DEL_FLAG = '0'
+        AND CUSTOMER_ID = #{customerId}
+
+    </select>
 
 </mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java

@@ -25,6 +25,8 @@ public class PatrolRoutineWorkResult implements Serializable {
 
     private String title;
 
+    private String userId;
+
     /**
      * 一级工作类型 code
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java

@@ -123,5 +123,10 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity {
      */
 	private String latestPatrolStatus;
 
+	/**
+	 * 例行工作次数
+	 */
+	private Integer routineWorkCount;
+
 
 }