From 680dcf28561284eb1b73b32f7ad4980ceb83e9ee Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 6 Dec 2021 10:27:20 +0800
Subject: [PATCH] edit

---
 .../entity/user/StatsStaffPatrolRecordDailyEntity.java   | 4 ----
 .../com/epmet/dao/StatsStaffPatrolRecordDailyDao.java    | 2 +-
 .../epmet/entity/StatsStaffPatrolRecordDailyEntity.java  | 4 ----
 .../epmet/service/impl/StaffPatrolRecordServiceImpl.java | 9 ++++-----
 .../resources/db/migration/V0.0.18__add_is_hand_end.sql  | 5 ++++-
 .../resources/mapper/StatsStaffPatrolRecordDailyDao.xml  | 1 -
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java
index f35134647c..247d87f285 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java
@@ -123,9 +123,5 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity {
 	 */
 	private String latestPatrolStatus;
 
-	/**
-	 * 是否手动结束 手动:1，定时任务传参:0
-	 */
-	private Integer isHandEnd;
 
 }
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 5c6d71c590..15b4b8c02d 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
@@ -63,7 +63,7 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrol
      */
     void updateStatsRecordEnd(@Param("userId")String userId,@Param("totalTime") Integer totalTime,
                               @Param("projectCount")Integer projectCount,@Param("dateId")String dateId,
-                              @Param("gridId")String gridId, @Param("isHandEnd")Integer isHandEnd);
+                              @Param("gridId")String gridId);
 
     /**
      * @Description  查询巡查人数
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java
index 8eb89400a2..4f1a18347d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java
@@ -123,9 +123,5 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity {
      */
 	private String latestPatrolStatus;
 
-	/**
-	 * 是否手动结束 手动: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 988ef9a5cb..f0682b25b6 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
@@ -278,7 +278,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		detailEntity.setSpeed(formDTO.getSpeed());
 		staffPatrolDetailService.insert(detailEntity);
 		// 添加巡查统计表逻辑
-		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,record.getPatrolStartTime(),patrolEndTime,record.getGrid(),NumConstant.ONE);
+		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,record.getPatrolStartTime(),patrolEndTime,record.getGrid());
 		sendPatrolMsg(record, SystemMessageType.USER_PATROL_STOP);
 
 	}
@@ -321,7 +321,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 				item.setTotalTime(totalTime);
 				item.setUpdatedTime(null);
 				item.setIsHandEnd(NumConstant.ZERO);
-				statsPatrolUpdateEnd(item.getStaffId(),totalTime, item.getPatrolStartTime(), endTime, item.getGrid(), NumConstant.ZERO);
+				statsPatrolUpdateEnd(item.getStaffId(),totalTime, item.getPatrolStartTime(), endTime, item.getGrid());
 			});
 
 			updateBatchById(list);
@@ -336,12 +336,11 @@ 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, Integer isHandEnd){
+	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);
@@ -352,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,isHandEnd);
+		statsStaffPatrolRecordDailyDao.updateStatsRecordEnd(userId,totalTime,data,dateId,gridId);
 	}
 
 	/**
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql
index 609d117f3f..08f25e4b2f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql
@@ -1,2 +1,5 @@
 alter table staff_patrol_record add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 0 COMMENT '是否手动结束 手动:1，定时任务传参:0';
-alter table stats_staff_patrol_record_daily add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 0 COMMENT '是否手动结束 手动:1，定时任务传参:0';
\ No newline at end of file
+
+UPDATE staff_patrol_record
+SET is_hand_end  = 1
+WHERE ID IN (SELECT ID FROM staff_patrol_record WHERE ACTRUAL_END_TIME NOT LIKE '%23:59:59');
\ No newline at end of file
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 130fbd57cc..f1ae028345 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,7 +20,6 @@
             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}