From 86080fc5f7a31dfbe9ef452e4a23dd3c18dae7e0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 17:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E-=E8=B7=B3=E8=BD=AC=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessInfoEOServiceImpl.java        | 43 +++++++++++++++----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
index 9992978c4..01d5e42db 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
@@ -17,13 +18,28 @@ import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluation
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
-import com.jero.modules.project.entity.*;
-import com.jero.modules.project.enums.*;
-import com.jero.modules.project.service.*;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.entity.ProjectTaskInventoryFeedbackEO;
+import com.jero.modules.project.enums.CertificationFlowNodeEnum;
+import com.jero.modules.project.enums.DesignComplianceStatusEnum;
+import com.jero.modules.project.enums.InventoryAffirmNodeEnum;
+import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import com.jero.modules.project.enums.ReviewResultEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
+import com.jero.modules.project.service.IProjectLawsInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
+import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
+import com.jero.modules.project.service.IProjectTaskInventoryEOService;
+import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
-import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
@@ -48,17 +64,23 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.Collator;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * @Description: 流程信息表
  * @Author: jero-boot
@@ -565,6 +587,9 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 
 			List<String> userIdList = new ArrayList<>();
 			datas.forEach(data -> {
+				if(StringUtils.isBlank(data.getProjectNameId())){
+					data.setProjectNameId(data.getProjectName());
+				}
 				String standardInfo = data.getStandardInfo();
 				if(StringUtils.isNotBlank(standardInfo)){
 					String standardInfoTemp = standardInfo.replaceAll("、", " ");