From 8e2d30fd6ac9c8cd3ee6d68c8fd575848f37390d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 31 八月 2021 10:42:13 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
index 8645f83..2b6b7ea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
@@ -93,7 +93,13 @@
BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwPatrolRecordDO);
Long patrolRecordId = Snowflake.getId();
comSwPatrolRecordDO.setId(patrolRecordId);
- comSwPatrolRecordDO.setPatrolTime(new Date());
+ if(StringUtils.isEmpty(comSwPatrolRecordAddDTO.getPatrolTime())){
+ comSwPatrolRecordDO.setPatrolTime(new Date());
+ }else {
+ comSwPatrolRecordDO.setPatrolTime(
+ DateUtils.stringToDate(comSwPatrolRecordAddDTO.getPatrolTime(), DateUtils.yyyyMMdd_format));
+ }
+// comSwPatrolRecordDO.setPatrolTime(new Date());
comSwPatrolRecordDO.setSuccessionTime(
DateUtils.stringToDate(comSwPatrolRecordAddDTO.getSuccessionTime(), DateUtils.yyyyMMdd_format));
StringBuilder nameString = new StringBuilder();
--
Gitblit v1.7.1