From 75045db5272b04c0473c40dc4b394d8ee82ce702 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 19:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessHistoryEOServiceImpl.java     | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
index 85c46b992..25d315360 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
@@ -2,15 +2,21 @@ package com.jero.modules.wkflow.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.enums.CertificationFlowNodeEnum;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.project.enums.ReviewResultEnum;
+import com.jero.modules.project.service.impl.LawsInventoryPlatformEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
@@ -23,18 +29,17 @@ import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import com.jero.modules.wkflow.mapper.ProcessHistoryEOMapper;
 import com.jero.modules.wkflow.service.IProcessHistoryEOService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
  * @Description: 流程历史表
  * @Author: jero-boot
@@ -50,6 +55,10 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 	private IProcessInfoEOService processInfoEOService;
 	@Autowired
 	private IOSSFileService ossFileService;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
+	@Autowired
+	private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService;
 
 	/**
 	 * 保存
@@ -296,6 +305,22 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 		if (StringUtils.isEmpty(projectLawsInventoryId)) {
 			throw new JeroBootException("法规清单id不能为空！");
 		}
+		//查询是否关联平台件
+		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,projectLawsInventoryId);
+		List<LawsInventoryPlatformEO> platformEOList = lawsInventoryPlatformEOService.list(wrapper);
+
+		//List<String> valueList = FlowStateEnum.getValueInfo();
+		List<ProjectLawsInventoryEO> lawsInventoryEOList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(platformEOList)){
+			List<String> lawsInventoryIdList = platformEOList.stream()
+					.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).distinct().collect(Collectors.toList());
+			lawsInventoryEOList = projectLawsInventoryEOService.listByIds(lawsInventoryIdList);
+			if(ObjectUtils.isNotEmpty(lawsInventoryEOList)){
+				projectLawsInventoryId = lawsInventoryEOList.get(0).getId();
+			}
+		}
+
 		String flowType = (String) params.get("flowType");
 		List<String> flowTypeList = new ArrayList<>();
 		flowTypeList.add(flowType);