|
|
|
@ -171,7 +171,7 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign |
|
|
|
PlanAssignSteerModify modify = auditAndGetModify(id, result, remark); |
|
|
|
PlanAssignSteerModify modify = auditAndGetModify(id, result, remark); |
|
|
|
|
|
|
|
|
|
|
|
Long currentUserId = AuthUtil.getUserId(); |
|
|
|
Long currentUserId = AuthUtil.getUserId(); |
|
|
|
String currentUserName = AuthUtil.getUserName(); |
|
|
|
String currentUserName = AuthUtil.getNickName(); |
|
|
|
String userAccount = AuthUtil.getUserAccount(); |
|
|
|
String userAccount = AuthUtil.getUserAccount(); |
|
|
|
Date now = new Date(); |
|
|
|
Date now = new Date(); |
|
|
|
|
|
|
|
|
|
|
|
@ -533,11 +533,11 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign |
|
|
|
node.setLabel("审批人"); |
|
|
|
node.setLabel("审批人"); |
|
|
|
|
|
|
|
|
|
|
|
// 根据审批结果设置状态和值
|
|
|
|
// 根据审批结果设置状态和值
|
|
|
|
if (PlanAssignSteerModify.ApprovalStatus.PASS.equals(record.getAuditResult())) { |
|
|
|
if (RESULT_PASS.equals(record.getAuditResult())) { |
|
|
|
node.setValue(record.getAuditorName() != null ? record.getAuditorName() : "未知"); |
|
|
|
node.setValue(record.getAuditorName() != null ? record.getAuditorName() : "未知"); |
|
|
|
node.setStatus("success"); |
|
|
|
node.setStatus("success"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (PlanAssignSteerModify.ApprovalStatus.REJECT.equals(record.getAuditResult())) { |
|
|
|
if (RESULT_REJECT.equals(record.getAuditResult())) { |
|
|
|
node.setValue(record.getAuditorName() != null ? record.getAuditorName() : "未知"); |
|
|
|
node.setValue(record.getAuditorName() != null ? record.getAuditorName() : "未知"); |
|
|
|
node.setStatus("false"); |
|
|
|
node.setStatus("false"); |
|
|
|
} |
|
|
|
} |
|
|
|
|