From c2ac3c8da33366d265db03b216eb1da818fb075b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 12 Jul 2024 14:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E5=B8=83=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IProcessMarketStandardReleaseService.java |  7 ++++++
 ...ocessMarketStandardReleaseServiceImpl.java | 23 +++++++++++++++++++
 .../impl/LawsMarketStandardServiceImpl.java   | 17 +++++++++++++-
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java
index 1c764211..9bc33fcf 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java
@@ -26,4 +26,11 @@ public interface IProcessMarketStandardReleaseService extends IService<ProcessMa
     String generate(ProcessMarketStandardRelease scc, MultipartFile modelFile, MultipartFile splitFile) throws Exception;
 
     void flowListener(DelegateExecution delegateExecution);
+
+    /**
+     * 根据id 判断数据的流程状态
+     * @param id
+     * @return boolean true:没有流程或流程已结束  false:有正在流转的流程
+     */
+    boolean checkProcessStatus(String id);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
index 904e3781..03cb8f65 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
@@ -34,6 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.jero.modules.activiti.common.ActivitiCommon.PASS;
 
@@ -254,6 +255,28 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
         }
         return result;
     }
+
+
+    @Override
+    public boolean checkProcessStatus(String id) {
+        LambdaQueryWrapper<ProcessMarketStandardRelease> queryWrapperMarketStandardRelease = new LambdaQueryWrapper<>();
+        queryWrapperMarketStandardRelease.select(ProcessMarketStandardRelease::getProcessInstanceId);
+        queryWrapperMarketStandardRelease.eq(ProcessMarketStandardRelease::getManifestId,id);
+        List<ProcessMarketStandardRelease> listProcessMarketStandardRelease = list(queryWrapperMarketStandardRelease);
+        if(CollectionUtils.isEmpty(listProcessMarketStandardRelease)){
+            return true;
+        }
+        List<String> listProcessInstanceId = listProcessMarketStandardRelease.stream()
+                .map(ProcessMarketStandardRelease::getProcessInstanceId).collect(Collectors.toList());
+        LambdaQueryWrapper<ProcessAll> queryProcessAll = new LambdaQueryWrapper<>();
+        queryProcessAll.in(ProcessAll::getProcessInstanceId,listProcessInstanceId);
+        queryProcessAll.eq(ProcessAll::getPrcStatus,"1");
+        long l = processAllService.count(queryProcessAll);
+        if(l > 0){
+            return false;
+        }
+        return true;
+    }
 }
 
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
index f3b1c0b1..d19590b4 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
@@ -11,6 +11,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.activiti.process.ms.service.IProcessMarketStandardReleaseService;
 import com.jero.modules.laws.marketStandard.constans.MarketStandardConstants;
 import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard;
 import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail;
@@ -53,6 +54,8 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     private ILawsMarketStandardDetailService lawsMarketStandardDetailService;
     @Resource
     private ISysBaseAPI sysBaseAPI;
+    @Resource
+    private IProcessMarketStandardReleaseService processMarketStandardReleaseService;
 
     public static final String CLASS = "entity";
     public static final String PARAMS = "params";
@@ -253,6 +256,12 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
                 && !Objects.equals(sysUser.getId(),lawsMarketStandard.getAuthor())){
             return Result.error("没有权限");
         }
+        // 验证是否已发起流程
+        boolean flag = processMarketStandardReleaseService.checkProcessStatus(id);
+        if(!flag){
+            return Result.error("当前数据已发布的流程未结束，不可重复发布");
+        }
+
         // 获取不同版本的数据
         LambdaQueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new LambdaQueryWrapper<>();
         queryLawsMarketStandard.select(LawsMarketStandard::getId);
@@ -361,7 +370,13 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
                 && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
                 && !Objects.equals(lawsMarketStandardOld.getAuthor(),sysUser.getId())){
-            throw new JeroBootException("没有权限");
+            return Result.error("没有权限");
+        }
+
+        // 验证是否已发起流程
+        boolean flag = processMarketStandardReleaseService.checkProcessStatus(id);
+        if(!flag){
+            return Result.error("当前数据已发布的流程未结束，不可重复发布");
         }
         if(Objects.equals(lawsMarketStandardOld.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){
             return Result.error("数据已发布");