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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java

@@ -88,6 +88,11 @@ public class StaffPatrolRecordDTO implements Serializable {
      */
 	private String status;
 
+    /**
+     * 是否手动结束 手动:1，定时任务传参:0
+     */
+	private Integer isHandEnd;
+
     /**
      * 删除标识 0.未删除 1.已删除
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordListResultDTO.java

@@ -45,4 +45,9 @@ public class PatrolRecordListResultDTO implements Serializable {
 	 */
 	private List<PatrolRecordDetailDTO> details;
 
+	/**
+	 * 是否手动结束 手动:1，定时任务传参:0
+	 */
+	private Integer isHandEnd;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -209,6 +209,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             dto.setStatus(record.getStatus());
             dto.setPatrolStartTime(DateUtils.format(record.getPatrolStartTime(), DateUtils.DATE_TIME_PATTERN));
             dto.setPatrolEndTime(DateUtils.format(record.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN));
+            dto.setIsHandEnd(record.getIsHandEnd());
             Integer minutes;
             if (("patrolling").equals(record.getStatus())) {
                 minutes = DateUtils.calculateMin(record.getPatrolStartTime(), new Date());