From 58eb90af5d85a49f84c1b6b2ddf0a2bfc1744685 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 2 Jul 2021 10:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A1=E6=9F=A5=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/PatrolProjectFormDTO.java  | 4 ++--
 .../epmet/service/impl/StaffPatrolRecordServiceImpl.java    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PatrolProjectFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PatrolProjectFormDTO.java
index c5add855bb..5e3f4bf813 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PatrolProjectFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PatrolProjectFormDTO.java
@@ -20,10 +20,10 @@ public class PatrolProjectFormDTO implements Serializable {
     /**
      * 巡查开始时间
      */
-    private Date patrolStartTime;
+    private String patrolStartTime;
 
     /**
      * 巡查结束时间
      */
-    private Date patrolEndTime;
+    private String patrolEndTime;
 }
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 e9751e23f8..32599fccbf 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
@@ -272,7 +272,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		detailEntity.setSpeed(formDTO.getSpeed());
 		staffPatrolDetailService.insert(detailEntity);
 		// 添加巡查统计表逻辑
-		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,patrolEndTime,record.getPatrolStartTime(),record.getGrid());
+		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,record.getPatrolStartTime(),patrolEndTime,record.getGrid());
 	}
 
 	/**
@@ -289,8 +289,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		String dateId = DateUtils.getBeforeNDay(NumConstant.ZERO);
 		PatrolProjectFormDTO formDTO = new PatrolProjectFormDTO();
 		formDTO.setUserId(userId);
-		formDTO.setPatrolStartTime(patrolStartTime);
-		formDTO.setPatrolEndTime(patrolEndTime);
+		formDTO.setPatrolStartTime(DateUtils.format(patrolStartTime,DateUtils.DATE_TIME_PATTERN));
+		formDTO.setPatrolEndTime(DateUtils.format(patrolEndTime,DateUtils.DATE_TIME_PATTERN));
 		Result<Integer> patrolProject = govProjectOpenFeignClient.selectPatrolProject(formDTO);
 		if (!patrolProject.success()){
 			throw new RenException("查询巡查期间立项数失败【"+patrolProject.getInternalMsg()+"】");