From 45b04290448d1d11cb8441814a4ddc0e6faad892 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 8 Jul 2022 19:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=20=2055638=20=20-=20=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=20=20=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProjectTaskInventoryEO.java        |  22 ++
 .../ProjectTaskInventoryEOServiceImpl.java    | 191 ++++++++++--------
 2 files changed, 133 insertions(+), 80 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
index 70de0d84a..37aef3e07 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
@@ -315,4 +315,26 @@ public class ProjectTaskInventoryEO implements Serializable {
     /**法规清单id数组  查询使用**/
     @TableField(exist = false)
     private List<String> projectLawsInventoryIdList;
+
+
+    //设计符合性确认-发起人id
+    @TableField(exist = false)
+    private String designInitiatorId;
+    //验证符合性确认-发起人id
+    @TableField(exist = false)
+    private String verifyInitiatorId;
+    //prehomo确认-发起人id
+    @TableField(exist = false)
+    private String prehomoInitiatorId;
+
+    //设计符合性 - 责任人id
+    @TableField(exist = false)
+    private String designDutyId;
+    //验证符合性确认-责任人id
+    @TableField(exist = false)
+    private String verifyDutyId;
+    //prehomo确认-责任人id
+    @TableField(exist = false)
+    private String prehomoDutyId;
+
 }
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 774053a20..87c747dfb 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
@@ -209,6 +209,13 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 							projectTaskInventory.setVerifyDueDate(projectLawsInventory.getVerifyDueDate());
 							projectTaskInventory.setPrehomoDueDate(projectLawsInventory.getPrehomoDueDate());
 							projectTaskInventory.setLawsInventoryCreateTime(projectLawsInventory.getCreateTime());
+
+							projectTaskInventory.setDesignInitiatorId(projectLawsInventory.getDesignInitiatorId());
+							projectTaskInventory.setVerifyInitiatorId(projectLawsInventory.getVerifyInitiatorId());
+							projectTaskInventory.setPrehomoInitiatorId(projectLawsInventory.getPrehomoInitiatorId());
+							projectTaskInventory.setDesignDutyId(projectLawsInventory.getDesignDutyId());
+							projectTaskInventory.setVerifyDutyId(projectLawsInventory.getVerifyDutyId());
+							projectTaskInventory.setPrehomoDutyId(projectLawsInventory.getPrehomoDutyId());
 						}
 					});
 				});
@@ -462,6 +469,21 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 				roleCode = ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue();
 			}
 
+			//如果用户是验证符合性流程中的发起人或责任人
+			boolean showVerify = (StringUtils.equals(projectTaskInventoryEO.getVerifyInitiatorId(),currentUser.getId())
+					|| StringUtils.equals(projectTaskInventoryEO.getVerifyDutyId(),currentUser.getId())
+			);
+
+			//如果用户是prehomo流程中的发起人或责任人
+			boolean showPrehomo = (StringUtils.equals(projectTaskInventoryEO.getPrehomoInitiatorId(),currentUser.getId())
+					|| StringUtils.equals(projectTaskInventoryEO.getPrehomoDutyId(),currentUser.getId())
+			);
+
+			//如果用户是设计符合性流程中的发起人或责任人
+			boolean showDesign = (StringUtils.equals(projectTaskInventoryEO.getDesignInitiatorId(),currentUser.getId())
+					|| StringUtils.equals(projectTaskInventoryEO.getDesignDutyId(),currentUser.getId())
+			);
+
 			ConditionAssessmentEO projectStatusAssess = conditionAssessmentEOService.getProjectStatusAssess(projectTaskInventoryEO.getProjectLawsInventoryId(),roleCode,currentUser,projectTaskInventory);
 			if(projectStatusAssess != null){
 				projectTaskInventoryEO.setProjectStatusAssess(projectStatusAssess.getConditionAssessment());
@@ -501,93 +523,102 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					 * 2022-07-07修改禅道 55588问题。 只有studio可以查看所有已经启动了的流程
 					 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
 					 */
-					if(isStudio){
+					if(isStudio || (showVerify || showDesign || showPrehomo)){
 						actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
-						if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
-							designPid = actiProcInstId;
-							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
-								designTaskId = projectTaskInventoryDetailEO.getTaskId();
-								designTaskStatus = projectTaskInventoryDetailEO.getStatus();
-								designTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
-								designTaskDetailId = projectTaskInventoryDetailEO.getId();
-							}else {
-								if(StringUtils.isEmpty(designTaskId)){
+						if(isStudio || showDesign){
+							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
+								designPid = actiProcInstId;
+								if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
 									designTaskId = projectTaskInventoryDetailEO.getTaskId();
-								}
-								if(StringUtils.isEmpty(designTaskStatus)){
-									designTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
-								}
-								if(StringUtils.isEmpty(designTaskDefinitionKey)){
-									designTaskDefinitionKey = "";
-								}
-								if(StringUtils.isEmpty(designTaskDetailId)){
+									designTaskStatus = projectTaskInventoryDetailEO.getStatus();
+									designTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
 									designTaskDetailId = projectTaskInventoryDetailEO.getId();
+								}else {
+									if(StringUtils.isEmpty(designTaskId)){
+										designTaskId = projectTaskInventoryDetailEO.getTaskId();
+									}
+									if(StringUtils.isEmpty(designTaskStatus)){
+										designTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
+									}
+									if(StringUtils.isEmpty(designTaskDefinitionKey)){
+										designTaskDefinitionKey = "";
+									}
+									if(StringUtils.isEmpty(designTaskDetailId)){
+										designTaskDetailId = projectTaskInventoryDetailEO.getId();
+									}
 								}
-							}
 
-							projectTaskInventoryEO.setDesignPId(designPid);
-							projectTaskInventoryEO.setDesignTaskId(designTaskId);
-							projectTaskInventoryEO.setDesignTaskStatus(designTaskStatus);
-							projectTaskInventoryEO.setDesignTaskDefinitionKey(designTaskDefinitionKey);
-							projectTaskInventoryEO.setDesignTaskDetailId(designTaskDetailId);
-						}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
-							prehomoPid = actiProcInstId;
-							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
-								prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
-								prehomoTaskStatus = projectTaskInventoryDetailEO.getStatus();
-								prehomoTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
-								prehomoTaskDetailId = projectTaskInventoryDetailEO.getId();
-							}else {
-								if(StringUtils.isEmpty(prehomoTaskId)){
-									prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
-								}
-								if(StringUtils.isEmpty(prehomoTaskStatus)){
-									prehomoTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
-								}
-								if(StringUtils.isEmpty(prehomoTaskDefinitionKey)){
-									prehomoTaskDefinitionKey = "";
-								}
-								if(StringUtils.isEmpty(prehomoTaskDetailId)){
-									prehomoTaskDetailId = projectTaskInventoryDetailEO.getId();
-								}
+								projectTaskInventoryEO.setDesignPId(designPid);
+								projectTaskInventoryEO.setDesignTaskId(designTaskId);
+								projectTaskInventoryEO.setDesignTaskStatus(designTaskStatus);
+								projectTaskInventoryEO.setDesignTaskDefinitionKey(designTaskDefinitionKey);
+								projectTaskInventoryEO.setDesignTaskDetailId(designTaskDetailId);
 							}
-
-							projectTaskInventoryEO.setPrehomoPId(prehomoPid);
-							projectTaskInventoryEO.setPrehomoTaskId(prehomoTaskId);
-							projectTaskInventoryEO.setPrehomoTaskStatus(prehomoTaskStatus);
-							projectTaskInventoryEO.setPrehomoTaskDefinitionKey(prehomoTaskDefinitionKey);
-							projectTaskInventoryEO.setPrehomoTaskDetailId(prehomoTaskDetailId);
-						}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
-							verifyPid = actiProcInstId;
-							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
-								verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
-								verifyTaskStatus = projectTaskInventoryDetailEO.getStatus();
-								verifyTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
-								verifyTaskDetailId = projectTaskInventoryDetailEO.getId();
-							}else {
-								if(StringUtils.isEmpty(verifyTaskId)){
-									verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
-								}
-								if(StringUtils.isEmpty(verifyTaskStatus)){
-									verifyTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
-								}
-								if(StringUtils.isEmpty(verifyTaskDefinitionKey)){
-									verifyTaskDefinitionKey = "";
-								}
-								if(StringUtils.isEmpty(verifyTaskDetailId)){
-									verifyTaskDetailId = projectTaskInventoryDetailEO.getId();
-								}
-							}
-
-							projectTaskInventoryEO.setVerifyPId(verifyPid);
-							projectTaskInventoryEO.setVerifyTaskId(verifyTaskId);
-							projectTaskInventoryEO.setVerifyTaskStatus(verifyTaskStatus);
-							projectTaskInventoryEO.setVerifyTaskDefinitionKey(verifyTaskDefinitionKey);
-							projectTaskInventoryEO.setVerifyTaskDetailId(verifyTaskDetailId);
 						}
+						if(isStudio || showPrehomo){
+							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
+								prehomoPid = actiProcInstId;
+								if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
+									prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
+									prehomoTaskStatus = projectTaskInventoryDetailEO.getStatus();
+									prehomoTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
+									prehomoTaskDetailId = projectTaskInventoryDetailEO.getId();
+								}else {
+									if(StringUtils.isEmpty(prehomoTaskId)){
+										prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
+									}
+									if(StringUtils.isEmpty(prehomoTaskStatus)){
+										prehomoTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
+									}
+									if(StringUtils.isEmpty(prehomoTaskDefinitionKey)){
+										prehomoTaskDefinitionKey = "";
+									}
+									if(StringUtils.isEmpty(prehomoTaskDetailId)){
+										prehomoTaskDetailId = projectTaskInventoryDetailEO.getId();
+									}
+								}
 
-						projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
-						projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
+								projectTaskInventoryEO.setPrehomoPId(prehomoPid);
+								projectTaskInventoryEO.setPrehomoTaskId(prehomoTaskId);
+								projectTaskInventoryEO.setPrehomoTaskStatus(prehomoTaskStatus);
+								projectTaskInventoryEO.setPrehomoTaskDefinitionKey(prehomoTaskDefinitionKey);
+								projectTaskInventoryEO.setPrehomoTaskDetailId(prehomoTaskDetailId);
+							}
+						}
+						if(isStudio || showVerify){
+							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
+								verifyPid = actiProcInstId;
+								if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
+									verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
+									verifyTaskStatus = projectTaskInventoryDetailEO.getStatus();
+									verifyTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
+									verifyTaskDetailId = projectTaskInventoryDetailEO.getId();
+								}else {
+									if(StringUtils.isEmpty(verifyTaskId)){
+										verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
+									}
+									if(StringUtils.isEmpty(verifyTaskStatus)){
+										verifyTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
+									}
+									if(StringUtils.isEmpty(verifyTaskDefinitionKey)){
+										verifyTaskDefinitionKey = "";
+									}
+									if(StringUtils.isEmpty(verifyTaskDetailId)){
+										verifyTaskDetailId = projectTaskInventoryDetailEO.getId();
+									}
+								}
+
+								projectTaskInventoryEO.setVerifyPId(verifyPid);
+								projectTaskInventoryEO.setVerifyTaskId(verifyTaskId);
+								projectTaskInventoryEO.setVerifyTaskStatus(verifyTaskStatus);
+								projectTaskInventoryEO.setVerifyTaskDefinitionKey(verifyTaskDefinitionKey);
+								projectTaskInventoryEO.setVerifyTaskDetailId(verifyTaskDetailId);
+							}
+						}
+						if(isStudio){
+							projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
+							projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
+						}
 					}else {
 						if((isRegulationOwner || isHomologationEngineer)){
 							projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
@@ -625,7 +656,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			}
 
 			/*if(StringUtils.isNotEmpty(actiProcInstId) && (isRegulationOwner || isHomologationEngineer || isStudio)){*/
-			if(StringUtils.isNotEmpty(actiProcInstId) && (isStudio)){
+			if(StringUtils.isNotEmpty(actiProcInstId) && (isStudio || (showVerify || showDesign || showPrehomo))){
 				projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
 			}