From 53e24a571be35bf9d7c38457510ce0ca099a01ef Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 30 May 2022 15:36:58 +0800
Subject: [PATCH] serviceCategoryKey

---
 .../java/com/epmet/controller/IcServiceProjectController.java | 4 ++--
 .../com/epmet/service/impl/IcServiceRecordServiceImpl.java    | 3 +++
 .../src/main/resources/mapper/IcServiceScopeDao.xml           | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java
index b0e21a1938..1a3b87b4f6 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java
@@ -140,8 +140,8 @@ public class IcServiceProjectController {
      * @return 【服务项目记录】取消：进行中的项目可以取消。删除该记录
      */
     @PostMapping("service/cancel/{service-id}")
-    public Result cancelService(@LoginUser TokenDto tokenDto, @PathVariable("service-id") String serviceId) {
-        icServiceRecordService.cancelService(serviceId, tokenDto.getUserId());
+    public Result cancelService(@PathVariable("service-id") String serviceId) {
+        icServiceRecordService.cancelService(serviceId, "yzm");
         return new Result();
     }
 
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 67379acd5e..5ac3c537f7 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
@@ -83,6 +83,9 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
     @Override
     public void updateServiceRecord(IcServiceEditFormDTO formDTO) {
         IcServiceRecordEntity icServiceRecordEntity = baseDao.selectById(formDTO.getServiceRecordId());
+        if (null == icServiceRecordEntity) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),String.format("服务记录不存在，serviceRecordId:%s",formDTO.getServiceRecordId()),"服务记录不存在");
+        }
         icServiceRecordEntity.setServiceTimeStart(formDTO.getServiceTimeStart());
         icServiceRecordEntity.setServiceTimeEnd(formDTO.getServiceTimeEnd());
         if(StringUtils.isNotBlank(formDTO.getPrincipalContact())){
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceScopeDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceScopeDao.xml
index 1695db62e7..026d8c6ac4 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceScopeDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceScopeDao.xml
@@ -23,7 +23,7 @@
     </resultMap>
 
     <update id="update" parameterType="map">
-        update ic_service_scope set del_flag='1',updatedTime=now(),updatedBy=#{userId}
+        update ic_service_scope set del_flag='1',UPDATED_TIME=now(),UPDATED_BY=#{userId}
         where SERVICE_RECORD_ID=#{serviceId}
     </update>