diff --git a/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVTodoEmulationInfoDM.java b/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVTodoEmulationInfoDM.java index 36a4f637..7c0db389 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVTodoEmulationInfoDM.java +++ b/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVTodoEmulationInfoDM.java @@ -244,9 +244,9 @@ public class LyricVTodoEmulationInfoDM implements Serializable { @TableField(value = "work_hour_plan") private String workHourPlan; -// @Schema(description = "提出人姓名") -// @TableField(value = "introduce_by_name") -// private String introduceByName; + @Schema(description = "提出人") + @TableField(value = "introduce_by") + private String introduceBy; @Schema(description = "驳回原因") @TableField(value = "turn_down_reason") diff --git a/project/src/main/java/com/sdm/project/common/MemberTypeEnum.java b/project/src/main/java/com/sdm/project/common/MemberTypeEnum.java index 9fbed22a..01c79460 100644 --- a/project/src/main/java/com/sdm/project/common/MemberTypeEnum.java +++ b/project/src/main/java/com/sdm/project/common/MemberTypeEnum.java @@ -5,6 +5,7 @@ import lombok.Getter; @Getter public enum MemberTypeEnum { + CREATOR("创建人", -1), PRINCIPAL("仿真负责人", 0), EXECUTOR("仿真执行人", 1), THREED("3D负责人", 2), diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index 5994f506..8837d8a4 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -543,12 +543,12 @@ public class LyricInternalServiceImpl implements ILyricInternalService { LyricVTodoEmulationInfoDM todo, List permissionList) { // 当前用户权限 - permissionList.add(buildUpdatePermissionReq(demandUuid, currentUserId, null)); +// permissionList.add(buildUpdatePermissionReq(demandUuid, currentUserId, null)); // 仿真负责人权限 - addPermissionReq(todo.getEmulationPerformer(), demandUuid, permissionList, MemberTypeEnum.PRINCIPAL.getCode()); - // 仿真执行人权限 - addPermissionReq(todo.getEmulationExecutor(), demandUuid, permissionList, MemberTypeEnum.EXECUTOR.getCode()); + addPermissionReq(todo.getVerifier(), demandUuid, permissionList, MemberTypeEnum.PRINCIPAL.getCode()); + // 需求创建人权限 + addPermissionReq(todo.getIntroduceBy(), demandUuid, permissionList, MemberTypeEnum.CREATOR.getCode()); } /** diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index 2ae3207c..aa561dd6 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -3280,16 +3280,22 @@ public class NodeServiceImpl extends ServiceImpl memberList = new ArrayList<>(); // 添加当前用户权限 - addUserPermission(permissionReqList, demandUuid, currentUserId,FilePermissionEnum.READ.getValue()); +// addUserPermission(permissionReqList, demandUuid, currentUserId,FilePermissionEnum.READ.getValue()); + + // 仿真负责人(在EP里是确认人):verifier + // 需求创建人(在EP里是提出人):introduceBy + addDemandMember(todoItem.getVerifier(),todoItem.getIntroduceBy(), MemberTypeEnum.PRINCIPAL.getCode(), demandUuid, currentUserId, currentTimeStr, memberList, permissionReqList); + - // 仿真负责人 - addDemandMember(todoItem.getEmulationPerformer(), 0, demandUuid, currentUserId, currentTimeStr, memberList, permissionReqList); // 仿真执行人 - addDemandMember(todoItem.getEmulationExecutor(), 1, demandUuid, currentUserId, currentTimeStr, memberList, permissionReqList); +// addDemandMember(todoItem.getEmulationExecutor(), 1, demandUuid, currentUserId, currentTimeStr, memberList, permissionReqList); // 3D负责人 - addDemandMember(todoItem.getThreeDimensionalPerformer(), 2, demandUuid, currentUserId, currentTimeStr, memberList, permissionReqList); +// addDemandMember(todoItem.getThreeDimensionalPerformer(), 2, demandUuid, currentUserId, currentTimeStr, memberList, permissionReqList); + + // 确认人 +// addDemandMember(todoItem.getThreeDimensionalPerformer(), 2, demandUuid, currentUserId, currentTimeStr, memberList, permissionReqList); return memberList; } @@ -3297,7 +3303,7 @@ public class NodeServiceImpl extends ServiceImpl memberList, List permissionReqList) { @@ -3307,12 +3313,23 @@ public class NodeServiceImpl extends ServiceImpl permissionReqList, String demandUuid, - Long userId,byte filePermissionEnumValue) { + Long userId,Long introduceByUserId,byte filePermissionEnumValue) { UpdatePermissionReq permissionReq = new UpdatePermissionReq(); permissionReq.setUserId(userId); permissionReq.setUuid(demandUuid); @@ -3346,6 +3363,16 @@ public class NodeServiceImpl extends ServiceImpl introduceByUserPermissions = new HashMap<>(); + introduceByUserPermissions.put(introduceByUserId, FilePermissionEnum.ALL.getValue()); + introduceByPermissionReq.setUserPermissions(introduceByUserPermissions); + introduceByPermissionReq.setPermission(FilePermissionEnum.ALL.getValue()); + permissionReqList.add(introduceByPermissionReq); } /**