Browse Source

审核流程节点npe

master
shihao0303 2 months ago
parent
commit
d702c027cd
  1. 14
      src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java

14
src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java

@ -99,13 +99,13 @@ public class ReportFlowService extends ServiceImpl<ReportFlowMapper,ReportFlow>
reportFlow.setApprover(queryParam.getApprover());
reportFlow.setApproverTime(LocalDateTime.now());
reportFlow.setApproverMessage(queryParam.getMessage());
reportFlow.setApproverState(queryParam.getIsAudit() ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel());
reportFlow.setApproverState(Boolean.TRUE.equals(queryParam.getIsAudit()) ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel());
baseMapper.updateById(reportFlow);
if (!FlowEnum.Initial.getLabel().equals(project.getNode())) {
//录入新审批记录
ReportFlow NextFlow = new ReportFlow();
if (queryParam.getIsAudit()) {
if (Boolean.TRUE.equals(queryParam.getIsAudit())) {
NextFlow.setReportId(queryParam.getReportId());
if(project.getNode().equals(FlowEnum.LeadInstance.getLabel())){
@ -228,12 +228,12 @@ public class ReportFlowService extends ServiceImpl<ReportFlowMapper,ReportFlow>
.last("limit 1"));
reportFlow.setApproverTime(LocalDateTime.now());
reportFlow.setApproverMessage(queryParam.getMessage());
reportFlow.setApproverState(queryParam.getIsAudit() ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel());
reportFlow.setApproverState(Boolean.TRUE.equals(queryParam.getIsAudit()) ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel());
baseMapper.updateById(reportFlow);
if (!FlowWarningEnum.state.getLabel().equals(record.getNode())) {
//录入新审批记录
ReportFlow NextFlow = new ReportFlow();
if (queryParam.getIsAudit()) {
if (Boolean.TRUE.equals(queryParam.getIsAudit())) {
NextFlow.setReportId(queryParam.getReportId());
if (record.getNode().equals(FlowWarningEnum.leader.getLabel())) {
NextFlow.setReportLink(FlowWarningEnum.end.getLabel());
@ -334,13 +334,13 @@ public class ReportFlowService extends ServiceImpl<ReportFlowMapper,ReportFlow>
.last("limit 1"));
reportFlow.setApproverTime(LocalDateTime.now());
reportFlow.setApproverMessage(queryParam.getMessage());
reportFlow.setApproverState(queryParam.getIsAudit() ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel());
reportFlow.setApproverState(Boolean.TRUE.equals(queryParam.getIsAudit()) ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel());
baseMapper.updateById(reportFlow);
if (!FlowWarningEnum.state.getLabel().equals(record.getInformState())) {
//录入新审批记录
ReportFlow NextFlow = new ReportFlow();
//是否驳回
if (queryParam.getIsAudit()) {
if (Boolean.TRUE.equals(queryParam.getIsAudit())) {
NextFlow.setReportId(queryParam.getReportId());
if (record.getInformNode().equals(FlowWarningEnum.inform.getLabel())) {
NextFlow.setReportLink(FlowWarningEnum.end.getLabel());
@ -438,7 +438,7 @@ public class ReportFlowService extends ServiceImpl<ReportFlowMapper,ReportFlow>
//接收人
informMessage.setRecipient(recipient);
informMessage.setRecipientId(recipientId);
informMessage.setFlowState(queryParam.getIsAudit() ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel());
informMessage.setFlowState(Boolean.TRUE.equals(queryParam.getIsAudit()) ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel());
informMessageMapper.insert(informMessage);
}

Loading…
Cancel
Save