From b900eab9315edfe731de52362f2e9e82fb2f6767 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Jun 2022 09:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=98=AF=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84=E9=9C=80=E6=B1=82=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/IcUserDemandRecService.java |  2 ++
 .../service/impl/IcPartyUnitServiceImpl.java      | 15 +++++----------
 .../service/impl/IcUserDemandRecServiceImpl.java  |  5 +++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
index eb5f2f89fc..1824e1feb3 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
@@ -260,4 +260,6 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
      * @Description 事件评价时同步=评价结果到需求
      **/
     void icEventComment(IcEventCommentToDemandFromDTO formDTO);
+
+    Integer selectCountByServerId(String serverId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index b5d4c4aa4e..730b46acf0 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -41,7 +41,6 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
-import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -51,17 +50,9 @@ import com.epmet.constant.UserDemandConstant;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcPartyUnitDao;
 import com.epmet.dto.IcPartyUnitDTO;
-import com.epmet.dto.form.ImportTaskCommonFormDTO;
-import com.epmet.dto.form.PartyActivityFormDTO;
-import com.epmet.dto.form.PartyUnitFormDTO;
-import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
-import com.epmet.dto.result.PartyTypepercentResultDTO;
-import com.epmet.dto.result.PartyUnitDistributionResultDTO;
-import com.epmet.dto.result.PartyUnitListResultDTO;
-import com.epmet.dto.result.PartyUnitListbrieResultDTO;
-import com.epmet.dto.result.UploadImgResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceStatDTO;
 import com.epmet.entity.IcPartyUnitEntity;
@@ -242,6 +233,10 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String id) {
+        //存在未完成的需求，不能删除
+        if (icUserDemandRecService.selectCountByServerId(id) > NumConstant.ZERO) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未完成的服务", "存在未完成的服务，不能删除");
+        }
         // 逻辑删除（@TableLogic 注解）
         baseDao.deleteById(id);
     }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index b552251007..2d04bec434 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -1810,6 +1810,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         baseDao.updateById(entity);
     }
 
+    @Override
+    public Integer selectCountByServerId(String serverId) {
+        return baseDao.selectCountByServerId(serverId);
+    }
+
 
 }