From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java |    7 ++++++-
 1 files changed, 6 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 fcb048a..a0e3a74 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
@@ -110,6 +110,12 @@
         Long patrolRecordReport = Snowflake.getId();
         comSwPatrolRecordReportDO.setId(patrolRecordReport);
         comSwPatrolRecordReportDO.setPatrolRecordId(patrolRecordId);
+        if(StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getDangerDescription())){
+            comSwPatrolRecordAddDTO.setDagerDescription(comSwPatrolRecordAddDTO.getDangerDescription());
+        }
+        if(StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getDagerName())){
+            comSwPatrolRecordAddDTO.setDangerName(comSwPatrolRecordAddDTO.getDagerName());
+        }
         if (comSwPatrolRecordAddDTO.getIsHiddenDanger().intValue() == ComSwPatrolRecordAddDTO.isOk.yes) {
             //如果存在安全隐患,自动生成安全隐患报告
             ComSwDangerReportDO comSwDangerReportDO = new ComSwDangerReportDO();
@@ -124,7 +130,6 @@
                 comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.DCL.getCode()));
             }
             BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
-            comSwDangerReportDO.setDagerDescription(comSwPatrolRecordAddDTO.getDangerDescription());
             comSwDangerReportDO.setPersonName(comSwPatrolRecordAddDTO.getDPersonName());
             comSwDangerReportDO.setPersonPhone(comSwPatrolRecordAddDTO.getDPersonPhone());
             comSwDangerReportDAO.insert(comSwDangerReportDO);

--
Gitblit v1.7.1