From e7d56433e5cc7d93ac0070e69e3f0dcf89bdf579 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 6 Dec 2021 09:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=89=8B=E5=8A=A8=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=B7=A1=E6=9F=A5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/StatsStaffPatrolRecordDailyDao.java |  3 ++-
 .../com/epmet/entity/StaffPatrolRecordEntity.java     |  5 +++++
 .../service/impl/StaffPatrolRecordServiceImpl.java    | 11 +++++++----
 .../mapper/StatsStaffPatrolRecordDailyDao.xml         |  1 +
 4 files changed, 15 insertions(+), 5 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 b937e41f31..5c6d71c590 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
@@ -62,7 +62,8 @@ 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("gridId")String gridId);
+                              @Param("projectCount")Integer projectCount,@Param("dateId")String dateId,
+                              @Param("gridId")String gridId, @Param("isHandEnd")Integer isHandEnd);
 
     /**
      * @Description  查询巡查人数
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java
index 2eed573090..ab52721c9e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java
@@ -88,4 +88,9 @@ public class StaffPatrolRecordEntity extends BaseEpmetEntity {
      */
 	private String status;
 
+	/**
+	 * 是否手动结束 手动:1，定时任务传参:0
+	 */
+	private Integer isHandEnd;
+
 }
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 0fbde4b393..2078d250b7 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
@@ -264,6 +264,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		Integer totalTime = DateUtils.calculateSecond(record.getPatrolStartTime(), record.getPatrolEndTime()) + 59;
 		record.setTotalTime(totalTime);
 		record.setStatus(PatrolConstant.END);
+		record.setIsHandEnd(NumConstant.ONE);
 		baseDao.updateById(record);
 		//保存记录明细
 		StaffPatrolDetailEntity detailEntity = new StaffPatrolDetailEntity();
@@ -276,7 +277,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		detailEntity.setSpeed(formDTO.getSpeed());
 		staffPatrolDetailService.insert(detailEntity);
 		// 添加巡查统计表逻辑
-		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,record.getPatrolStartTime(),patrolEndTime,record.getGrid());
+		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,record.getPatrolStartTime(),patrolEndTime,record.getGrid(),NumConstant.ONE);
 		sendPatrolMsg(record, SystemMessageType.USER_PATROL_STOP);
 
 	}
@@ -318,7 +319,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 				Integer totalTime = DateUtils.calculateSecond(item.getPatrolStartTime(), endTime) + 59;
 				item.setTotalTime(totalTime);
 				item.setUpdatedTime(null);
-				statsPatrolUpdateEnd(item.getStaffId(),totalTime, item.getPatrolStartTime(), endTime, item.getGrid());
+				item.setIsHandEnd(NumConstant.ZERO);
+				statsPatrolUpdateEnd(item.getStaffId(),totalTime, item.getPatrolStartTime(), endTime, item.getGrid(), NumConstant.ZERO);
 			});
 
 			updateBatchById(list);
@@ -333,11 +335,12 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 	 * @Param totalTime
 	 * @Param patrolStartTime
 	 * @Param patrolEndTime
+	 * @Param isHandEnd
 	 * @author zxc
 	 * @date 2021/7/1 10:50 上午
 	 */
 	@Transactional(rollbackFor = Exception.class)
-	public void statsPatrolUpdateEnd(String userId, Integer totalTime, Date patrolStartTime, Date patrolEndTime,String gridId){
+	public void statsPatrolUpdateEnd(String userId, Integer totalTime, Date patrolStartTime, Date patrolEndTime,String gridId, Integer isHandEnd){
 		String dateId = DateUtils.getBeforeNDay(NumConstant.ZERO);
 		PatrolProjectFormDTO formDTO = new PatrolProjectFormDTO();
 		formDTO.setUserId(userId);
@@ -348,7 +351,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 			throw new RenException("查询巡查期间立项数失败【"+patrolProject.getInternalMsg()+"】");
 		}
 		Integer data = patrolProject.getData();
-		statsStaffPatrolRecordDailyDao.updateStatsRecordEnd(userId,totalTime,data,dateId,gridId);
+		statsStaffPatrolRecordDailyDao.updateStatsRecordEnd(userId,totalTime,data,dateId,gridId,isHandEnd);
 	}
 
 	/**
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 f1ae028345..130fbd57cc 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
@@ -20,6 +20,7 @@
             PATROL_TOTAL = (PATROL_TOTAL + 1),
             REPORT_PROJECT_COUNT = (REPORT_PROJECT_COUNT + #{projectCount}),
             LATEST_PATROL_STATUS = 'end',
+            IS_HAND_END = #{isHandEnd},
             UPDATED_TIME = NOW()
         WHERE DEL_FLAG = 0
           AND STAFF_ID = #{userId}