From fda99cf1ecb1df3daa025799ac6743fef0bf237e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 19 Jul 2022 17:35:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcServiceFeedbackV2ServiceImpl.java  |  4 ++++
 .../impl/IcServiceRecordV2ServiceImpl.java    | 19 +++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceFeedbackV2ServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceFeedbackV2ServiceImpl.java
index 70525915ac..d1bdf326cc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceFeedbackV2ServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceFeedbackV2ServiceImpl.java
@@ -86,6 +86,10 @@ public class IcServiceFeedbackV2ServiceImpl extends BaseServiceImpl<IcServiceFee
             log.error(String.format("新增服务反馈记录失败，未查询到服务记录，服务记录Id->%s", formDTO.getServiceRecordId()));
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "新增服务反馈记录失败,未查询到服务记录");
         }
+        if (!"in_service".equals(recordV2Entity.getServiceStatus())) {
+            String msg = "服务状态不是进行中的，不允许反馈";
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
+        }
 
         //2.校验是否已存在服务反馈
         LambdaQueryWrapper<IcServiceFeedbackV2Entity> tWrapper = new LambdaQueryWrapper<>();
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java
index 9071a364bc..f817137bde 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java
@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -105,17 +106,12 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IcServiceRecordV2AddEditFormDTO formDTO) {
-        //1.获取工作人员缓存信息
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
-        if (null == staffInfo) {
-            throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId()));
-        }
-
-        //2.新增服务记录数据
+        //1.服务记录数据
         IcServiceRecordV2Entity entity = ConvertUtils.sourceToTarget(formDTO, IcServiceRecordV2Entity.class);
-        insert(entity);
+        entity.setId(IdWorker.getIdStr());
+        entity.setServiceStatus("in_service");
 
-        //3.新增服务范围数据
+        //2.新增服务范围数据
         List<IcServiceScopeV2Entity> scopeList = new ArrayList<>();
         formDTO.getObjList().stream().forEach(s -> {
             String[] scopeObjectIdPathAndName = icServiceRecordServiceImpl.getScopeObjectIdPath(s.getObjectType(), s.getObjectId());
@@ -129,8 +125,9 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
             scopeList.add(scope);
         });
 
-        //4.新增服务反馈数据feedback
+        //3.新增服务反馈数据feedback
         if(null != formDTO.getFeedback()){
+            entity.setServiceStatus(formDTO.getFeedback().getServiceStatus());
             IcServiceFeedbackV2Entity feedback = ConvertUtils.sourceToTarget(formDTO.getFeedback(), IcServiceFeedbackV2Entity.class);
             feedback.setCustomerId(formDTO.getCustomerId());
             feedback.setServiceRecordId(entity.getId());
@@ -153,6 +150,8 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
             }
         }
 
+        insert(entity);
+
     }
 
     @Override