From 7916649b913a8bdb5b2af34b4402718bb589635d Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 9 May 2022 16:12:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E7=AC=A6=E5=90=88=E6=80=A7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rojectTaskInventoryDetailEOController.java |  5 +-
 .../entity/ProjectTaskInventoryDetailEO.java  |  4 +
 .../IProjectTaskInventoryDetailEOService.java |  2 +-
 ...ojectTaskInventoryDetailEOServiceImpl.java | 34 +++++++-
 .../ProjectTaskInventoryEOServiceImpl.java    | 80 +++++++++++++++----
 5 files changed, 107 insertions(+), 18 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java
index ea95231e9..039b5c355 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java
@@ -176,8 +176,9 @@ public class ProjectTaskInventoryDetailEOController extends JeroController<Proje
 	 @AutoLog(value = "项目库-任务清单明细表-通过流程实例id查询")
 	 @ApiOperation(value="项目库-任务清单明细表-通过流程实例id查询", notes="项目库-任务清单明细表-通过流程实例id查询")
 	 @GetMapping(value = "/queryByActiProcInstId")
-	 public Result<?> queryByActiProcInstId(@RequestParam(name="actiProcInstId",required=true) String actiProcInstId) {
-		 return this.projectTaskInventoryDetailEOService.queryByActiProcInstId(actiProcInstId);
+	 public Result<?> queryByActiProcInstId(@RequestParam(name="actiProcInstId",required=true) String actiProcInstId,
+											@RequestParam(name="taskDefinitionKey",required=true)String taskDefinitionKey) {
+		 return this.projectTaskInventoryDetailEOService.queryByActiProcInstId(actiProcInstId, taskDefinitionKey);
 	 }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
index b90ffcff3..48f397ef4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
@@ -112,4 +112,8 @@ public class ProjectTaskInventoryDetailEO implements Serializable {
     /**消息类型*/
     @TableField(exist = false)
     private String msgType;
+
+    /**用户名*/
+    @TableField(exist = false)
+    private String userName;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java
index 2ef603d85..f1080f661 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java
@@ -65,5 +65,5 @@ public interface IProjectTaskInventoryDetailEOService extends IService<ProjectTa
 	 * @param actiProcInstId
 	 * @return
 	 */
-	Result<?> queryByActiProcInstId(String actiProcInstId);
+	Result<?> queryByActiProcInstId(String actiProcInstId,String taskDefinitionKey);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
index 4aad263d9..d590e58ae 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
@@ -14,6 +14,8 @@ import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper;
 import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
 import com.jero.modules.project.util.SendMessageUtils;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import me.zhyd.oauth.utils.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
@@ -43,6 +45,8 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 	@Autowired
 	private ProjectNameInfoEOMapper projectNameInfoEOMapper;
 
+	@Autowired
+	private ISysUserService sysUserService;
 
 	/**
 	 * 保存
@@ -135,13 +139,41 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
     }
 
 	@Override
-	public Result<?> queryByActiProcInstId(String actiProcInstId) {
+	public Result<?> queryByActiProcInstId(String actiProcInstId,String taskDefinitionKey) {
 		QueryWrapper<ProjectTaskInventoryDetailEO> queryWrapper = new QueryWrapper<>();
 		queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,actiProcInstId);
+		queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getTaskDefinitionKey,taskDefinitionKey);
 		List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOS = this.baseMapper.selectList(queryWrapper);
+		if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOS)){
+			disposeData(projectTaskInventoryDetailEOS);
+		}
 		return Result.OK(projectTaskInventoryDetailEOS);
 	}
 
+	/**
+	 * 处理数据
+	 * @param projectTaskInventoryDetailEOList
+	 */
+	public void disposeData(List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList){
+		if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){
+			List<String> userIdList = new ArrayList<>();
+			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) {
+				userIdList.add(projectTaskInventoryDetailEO.getUserId());
+			}
+			List<SysUser> sysUserList = new ArrayList<>();
+			if(CollectionUtils.isNotEmpty(userIdList)){
+				sysUserList = sysUserService.querySysUserListByIdList(userIdList);
+			}
+			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) {
+				for (SysUser sysUser : sysUserList) {
+					if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getUserId(),sysUser.getId())){
+						projectTaskInventoryDetailEO.setUserName(sysUser.getUsername());
+					}
+				}
+			}
+		}
+	}
+
 	public void sendMessage(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO,List<String> userIdList){
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index af2c5abd6..be2986391 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -324,6 +324,21 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			projectTaskInventoryEO.setRoleCode(roleCode);
 
+			String designPid = "";
+			String designTaskId = "";
+			String designTaskStatus = "";
+			String designTaskDefinitionKey = "";
+
+			String prehomoPid = "";
+			String prehomoTaskId = "";
+			String prehomoTaskStatus = "";
+			String prehomoTaskDefinitionKey = "";
+
+			String verifyPid = "";
+			String verifyTaskId = "";
+			String verifyTaskStatus = "";
+			String verifyTaskDefinitionKey = "";
+
 			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) {
 				if(StringUtils.equals(projectTaskInventoryEO.getProjectLawsInventoryId(),projectTaskInventoryDetailEO.getProjectTaskInventoryId())){
 					/**
@@ -334,31 +349,68 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					if(isStudio || (isRegulationOwner || isHomologationEngineer)){
 						actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
 						if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
-							projectTaskInventoryEO.setDesignPId(actiProcInstId);
-							projectTaskInventoryEO.setDesignTaskId(projectTaskInventoryDetailEO.getTaskId());
+							designPid = actiProcInstId;
 							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
-								projectTaskInventoryEO.setDesignTaskStatus(projectTaskInventoryDetailEO.getStatus());
+								designTaskId = projectTaskInventoryDetailEO.getTaskId();
+								designTaskStatus = projectTaskInventoryDetailEO.getStatus();
+								designTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
 							}else {
-								projectTaskInventoryEO.setDesignTaskStatus(TaskStatusEnum.SHOW_FLAG.getValue());
+								if(StringUtils.isEmpty(designTaskId)){
+									designTaskId = projectTaskInventoryDetailEO.getTaskId();
+								}
+								if(StringUtils.isEmpty(designTaskStatus)){
+									designTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
+								}
+								if(StringUtils.isEmpty(designTaskDefinitionKey)){
+									designTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
+								}
 							}
+
+							projectTaskInventoryEO.setDesignPId(designPid);
+							projectTaskInventoryEO.setDesignTaskId(designTaskId);
+							projectTaskInventoryEO.setDesignTaskStatus(designTaskStatus);
 						}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
-							projectTaskInventoryEO.setPrehomoPId(actiProcInstId);
-							projectTaskInventoryEO.setPrehomoTaskId(projectTaskInventoryDetailEO.getTaskId());
-
+							prehomoPid = actiProcInstId;
 							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
-								projectTaskInventoryEO.setPrehomoTaskStatus(projectTaskInventoryDetailEO.getStatus());
+								prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
+								prehomoTaskStatus = projectTaskInventoryDetailEO.getStatus();
+								prehomoTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
 							}else {
-								projectTaskInventoryEO.setPrehomoTaskStatus(TaskStatusEnum.SHOW_FLAG.getValue());
+								if(StringUtils.isEmpty(prehomoTaskId)){
+									prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
+								}
+								if(StringUtils.isEmpty(prehomoTaskStatus)){
+									prehomoTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
+								}
+								if(StringUtils.isEmpty(prehomoTaskDefinitionKey)){
+									prehomoTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
+								}
 							}
+
+							projectTaskInventoryEO.setPrehomoPId(prehomoPid);
+							projectTaskInventoryEO.setPrehomoTaskId(prehomoTaskId);
+							projectTaskInventoryEO.setPrehomoTaskStatus(prehomoTaskStatus);
 						}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
-							projectTaskInventoryEO.setVerifyPId(actiProcInstId);
-							projectTaskInventoryEO.setVerifyTaskId(projectTaskInventoryDetailEO.getTaskId());
-
+							verifyPid = actiProcInstId;
 							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
-								projectTaskInventoryEO.setVerifyTaskStatus(projectTaskInventoryDetailEO.getStatus());
+								verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
+								verifyTaskStatus = projectTaskInventoryDetailEO.getStatus();
+								verifyTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
 							}else {
-								projectTaskInventoryEO.setVerifyTaskStatus(TaskStatusEnum.SHOW_FLAG.getValue());
+								if(StringUtils.isEmpty(verifyTaskId)){
+									verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
+								}
+								if(StringUtils.isEmpty(verifyTaskStatus)){
+									verifyTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
+								}
+								if(StringUtils.isEmpty(verifyTaskDefinitionKey)){
+									verifyTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
+								}
 							}
+
+							projectTaskInventoryEO.setVerifyPId(verifyPid);
+							projectTaskInventoryEO.setVerifyTaskId(verifyTaskId);
+							projectTaskInventoryEO.setVerifyTaskStatus(verifyTaskStatus);
 						}
 					}else {
 						if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){