Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop

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

@@ -123,4 +123,9 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity {
 	 */
 	private String latestPatrolStatus;
 
+	/**
+	 * 是否手动结束 手动:1，定时任务传参:0
+	 */
+	private Integer isHandEnd;
+
 }

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

@@ -123,4 +123,9 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity {
      */
 	private String latestPatrolStatus;
 
+	/**
+	 * 是否手动结束 手动:1，定时任务传参:0
+	 */
+	private Integer isHandEnd;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -222,6 +222,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 			entity.setReportProjectCount(NumConstant.ZERO);
 			entity.setLatestPatrolTime(patrolStartTime);
 			entity.setLatestPatrolStatus(PatrolConstant.PATROLLING);
+			entity.setIsHandEnd(NumConstant.ZERO);
 			statsStaffPatrolRecordDailyDao.insert(entity);
 		}else {
 			// 存在记录，直接更新

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql

@@ -0,0 +1,2 @@
+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';