From ded4170c888f44743e76092c21e1607173e42082 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 1 Jul 2021 11:08:25 +0800
Subject: [PATCH] ..

---
 .../com/epmet/dao/StatsStaffPatrolRecordDailyDao.java     | 4 ++--
 .../epmet/service/impl/StaffPatrolRecordServiceImpl.java  | 8 ++++----
 .../resources/mapper/StatsStaffPatrolRecordDailyDao.xml   | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java
index 1abb137809..458a171d00 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java
@@ -40,7 +40,7 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrol
      * @author zxc
      * @date 2021/6/30 2:41 下午
      */
-    String checkStatsCount(@Param("staffId")String staffId, @Param("dateId")String dateId);
+    String checkStatsCount(@Param("staffId")String staffId, @Param("dateId")String dateId,@Param("gridId")String gridId);
 
     /**
      * @Description  更新最近巡查时间和巡查状态
@@ -59,6 +59,6 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrol
      * @date 2021/7/1 10:36 上午
      */
     void updateStatsRecordEnd(@Param("userId")String userId,@Param("totalTime") Integer totalTime,
-                              @Param("projectCount")Integer projectCount,@Param("dateId")String dateId);
+                              @Param("projectCount")Integer projectCount,@Param("dateId")String dateId,@Param("gridId")String gridId);
 
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
index c10b529f06..e9751e23f8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
@@ -198,7 +198,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 	public void statsPatrolUpdateStart(String userId,Date patrolStartTime,CustomerGridDTO grid){
 		// 巡查统计表更新数据
 		//1.校验是否有今天此人数据
-		String statsId = statsStaffPatrolRecordDailyDao.checkStatsCount(userId, DateUtils.getBeforeNDay(NumConstant.ZERO));
+		String statsId = statsStaffPatrolRecordDailyDao.checkStatsCount(userId, DateUtils.getBeforeNDay(NumConstant.ZERO),grid.getId());
 		if (StringUtils.isEmpty(statsId)){
 			DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(new Date());
 			// 不存在就插入新纪录
@@ -272,7 +272,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		detailEntity.setSpeed(formDTO.getSpeed());
 		staffPatrolDetailService.insert(detailEntity);
 		// 添加巡查统计表逻辑
-		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,patrolEndTime,record.getPatrolStartTime());
+		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,patrolEndTime,record.getPatrolStartTime(),record.getGrid());
 	}
 
 	/**
@@ -285,7 +285,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 	 * @date 2021/7/1 10:50 上午
 	 */
 	@Transactional(rollbackFor = Exception.class)
-	public void statsPatrolUpdateEnd(String userId, Integer totalTime, Date patrolStartTime, Date patrolEndTime){
+	public void statsPatrolUpdateEnd(String userId, Integer totalTime, Date patrolStartTime, Date patrolEndTime,String gridId){
 		String dateId = DateUtils.getBeforeNDay(NumConstant.ZERO);
 		PatrolProjectFormDTO formDTO = new PatrolProjectFormDTO();
 		formDTO.setUserId(userId);
@@ -296,7 +296,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 			throw new RenException("查询巡查期间立项数失败【"+patrolProject.getInternalMsg()+"】");
 		}
 		Integer data = patrolProject.getData();
-		statsStaffPatrolRecordDailyDao.updateStatsRecordEnd(userId,totalTime,data,dateId);
+		statsStaffPatrolRecordDailyDao.updateStatsRecordEnd(userId,totalTime,data,dateId,gridId);
 	}
 
 	/**
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StatsStaffPatrolRecordDailyDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StatsStaffPatrolRecordDailyDao.xml
index 734e25a847..da96fba412 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StatsStaffPatrolRecordDailyDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StatsStaffPatrolRecordDailyDao.xml
@@ -24,6 +24,7 @@
         WHERE DEL_FLAG = 0
           AND STAFF_ID = #{userId}
           AND DATE_ID = #{dateId}
+          AND GRID_ID = #{gridId}
     </update>
 
     <!-- 校验今天某人是不是有数据 -->
@@ -36,6 +37,7 @@
             DEL_FLAG = 0
           AND DATE_ID = #{dateId}
           AND STAFF_ID = #{staffId}
+          AND GRID_ID = #{gridId}
     </select>
 
 </mapper>
\ No newline at end of file