liweidong
张乾翔 2 days ago
parent 0a166bd748
commit 3cd3b33d4e
  1. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java
  2. 7
      blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java

@ -150,6 +150,9 @@ public class FmProjectMilestoneEntity extends BaseEntity {
*/
@Schema(description = "核查人")
private String checkMan;
@Schema(description = "核查人ID")
private String checkManId;
/**
* 核查时间
*/

@ -121,7 +121,12 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
if (!entity.getNextApproverId().equals(AuthUtil.getUserId())) {
throw new ServiceException("您不是当前里程碑的核查人");
}
fmProjectMilestone.setCheckMan(entity.getNextApproverId().toString());
R<User> userR1 = userClient.userInfoById(entity.getNextApproverId());
if (!userR1.isSuccess() || BeanUtil.isEmpty(userR1.getData())) {
throw new RuntimeException("当前里程碑的核查人不存在");
}
fmProjectMilestone.setCheckMan(userR1.getData().getRealName());
fmProjectMilestone.setCheckManId(entity.getNextApproverId().toString());
// 如果核查通过,需要流转到核准节点
if (FmProjectMilestoneEntity.CHECK_RESULT_OK.equals(fmProjectMilestone.getCheckResult())) {

Loading…
Cancel
Save