WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangzhijiang
2022-07-08 19:00:59 +08:00
parent c729d99559
commit 45b0429044
2 changed files with 133 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
+22
View File
@@ -315,4 +315,26 @@ public class ProjectTaskInventoryEO implements Serializable {
/**法规清单id数组 查询使用**/ /**法规清单id数组 查询使用**/
@TableField(exist = false) @TableField(exist = false)
private List<String> projectLawsInventoryIdList; 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
+111 -80
View File
@@ -209,6 +209,13 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
projectTaskInventory.setVerifyDueDate(projectLawsInventory.getVerifyDueDate()); projectTaskInventory.setVerifyDueDate(projectLawsInventory.getVerifyDueDate());
projectTaskInventory.setPrehomoDueDate(projectLawsInventory.getPrehomoDueDate()); projectTaskInventory.setPrehomoDueDate(projectLawsInventory.getPrehomoDueDate());
projectTaskInventory.setLawsInventoryCreateTime(projectLawsInventory.getCreateTime()); 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(); 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); ConditionAssessmentEO projectStatusAssess = conditionAssessmentEOService.getProjectStatusAssess(projectTaskInventoryEO.getProjectLawsInventoryId(),roleCode,currentUser,projectTaskInventory);
if(projectStatusAssess != null){ if(projectStatusAssess != null){
projectTaskInventoryEO.setProjectStatusAssess(projectStatusAssess.getConditionAssessment()); projectTaskInventoryEO.setProjectStatusAssess(projectStatusAssess.getConditionAssessment());
@@ -501,93 +523,102 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
* 2022-07-07修改禅道 55588问题。 只有studio可以查看所有已经启动了的流程 * 2022-07-07修改禅道 55588问题。 只有studio可以查看所有已经启动了的流程
* studio：查询所有（已启动流程的数据） ， 包含自己待办、已办 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
*/ */
if(isStudio){ if(isStudio || (showVerify || showDesign || showPrehomo)){
actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId(); actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){ if(isStudio || showDesign){
designPid = actiProcInstId; if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){ designPid = actiProcInstId;
designTaskId = projectTaskInventoryDetailEO.getTaskId(); if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
designTaskStatus = projectTaskInventoryDetailEO.getStatus();
designTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
designTaskDetailId = projectTaskInventoryDetailEO.getId();
}else {
if(StringUtils.isEmpty(designTaskId)){
designTaskId = projectTaskInventoryDetailEO.getTaskId(); designTaskId = projectTaskInventoryDetailEO.getTaskId();
} designTaskStatus = projectTaskInventoryDetailEO.getStatus();
if(StringUtils.isEmpty(designTaskStatus)){ designTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
designTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
}
if(StringUtils.isEmpty(designTaskDefinitionKey)){
designTaskDefinitionKey = "";
}
if(StringUtils.isEmpty(designTaskDetailId)){
designTaskDetailId = projectTaskInventoryDetailEO.getId(); 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.setDesignPId(designPid);
projectTaskInventoryEO.setDesignTaskId(designTaskId); projectTaskInventoryEO.setDesignTaskId(designTaskId);
projectTaskInventoryEO.setDesignTaskStatus(designTaskStatus); projectTaskInventoryEO.setDesignTaskStatus(designTaskStatus);
projectTaskInventoryEO.setDesignTaskDefinitionKey(designTaskDefinitionKey); projectTaskInventoryEO.setDesignTaskDefinitionKey(designTaskDefinitionKey);
projectTaskInventoryEO.setDesignTaskDetailId(designTaskDetailId); 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.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.setPrehomoPId(prehomoPid);
projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark()); 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 { }else {
if((isRegulationOwner || isHomologationEngineer)){ if((isRegulationOwner || isHomologationEngineer)){
projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress()); 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) && (isRegulationOwner || isHomologationEngineer || isStudio)){*/
if(StringUtils.isNotEmpty(actiProcInstId) && (isStudio)){ if(StringUtils.isNotEmpty(actiProcInstId) && (isStudio || (showVerify || showDesign || showPrehomo))){
projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue()); projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
} }