From 1549134785b90677998833545bf8b55b0b21ccd9 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Tue, 31 May 2022 17:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=9C=8D=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89feedback=E9=BB=98=E8=AE=A4=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcServiceRecordServiceImpl.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java
index c93c53f0f5..88d5559a34 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java
@@ -188,7 +188,13 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
         serviceRecord.setPrincipalContact(input.getPrincipalContact());
         serviceRecord.setServiceTimeStart(input.getServiceTimeStart());
         serviceRecord.setServiceTimeEnd(input.getServiceTimeEnd());
-        serviceRecord.setServiceStatus(feedbackDto.getServiceStatus());
+        if (feedbackDto == null) {
+            // 没写反馈，给一个服务中
+            serviceRecord.setServiceStatus("in_service");
+        } else {
+            // 写了反馈，按照反馈的来
+            serviceRecord.setServiceStatus(feedbackDto.getServiceStatus());
+        }
         serviceRecord.setRemark(input.getRemark());
 
         baseDao.insert(serviceRecord);