From 053e2e6ac401e5b1ef899011ebb4c34e26278b01 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 14:30:30 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java |    3 ++-
 1 files changed, 2 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..f8705eb 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
@@ -116,6 +116,7 @@
             Long dangerReportId = Snowflake.getId();
             comSwDangerReportDO.setId(dangerReportId);
             comSwPatrolRecordReportDO.setReportId(dangerReportId);
+            comSwDangerReportDO.setDangerName(comSwPatrolRecordAddDTO.getDagerName());
             comSwDangerReportDO.setDangerType(comSwPatrolRecordAddDTO.getPatrolType());
             if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes && StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getTakeSteps())) {
                 comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode()));
@@ -124,7 +125,7 @@
                 comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.DCL.getCode()));
             }
             BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
-            comSwDangerReportDO.setDagerDescription(comSwPatrolRecordAddDTO.getDangerDescription());
+            comSwDangerReportDO.setDagerDescription(comSwPatrolRecordAddDTO.getDagerDescription());
             comSwDangerReportDO.setPersonName(comSwPatrolRecordAddDTO.getDPersonName());
             comSwDangerReportDO.setPersonPhone(comSwPatrolRecordAddDTO.getDPersonPhone());
             comSwDangerReportDAO.insert(comSwDangerReportDO);

--
Gitblit v1.7.1