55638 - 任务清单 查询权限修改。

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;
+
 }

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,8 +523,9 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					 * 2022-07-07修改禅道 55588问题。 只有studio可以查看所有已经启动了的流程
 					 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
 					 */
-					if(isStudio){
+					if(isStudio || (showVerify || showDesign || showPrehomo)){
 						actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
+						if(isStudio || showDesign){
 							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
 								designPid = actiProcInstId;
 								if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
@@ -530,7 +553,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 								projectTaskInventoryEO.setDesignTaskStatus(designTaskStatus);
 								projectTaskInventoryEO.setDesignTaskDefinitionKey(designTaskDefinitionKey);
 								projectTaskInventoryEO.setDesignTaskDetailId(designTaskDetailId);
-						}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
+							}
+						}
+						if(isStudio || showPrehomo){
+							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
 								prehomoPid = actiProcInstId;
 								if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
 									prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
@@ -557,7 +583,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 								projectTaskInventoryEO.setPrehomoTaskStatus(prehomoTaskStatus);
 								projectTaskInventoryEO.setPrehomoTaskDefinitionKey(prehomoTaskDefinitionKey);
 								projectTaskInventoryEO.setPrehomoTaskDetailId(prehomoTaskDetailId);
-						}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
+							}
+						}
+						if(isStudio || showVerify){
+							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
 								verifyPid = actiProcInstId;
 								if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
 									verifyTaskId = projectTaskInventoryDetailEO.getTaskId();
@@ -585,9 +614,11 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 								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());
 			}