supervision
/
invest
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

审核流程节点npe

master
shihao0303 2 months ago
parent
c32ef2b7e8
commit
d702c027cd
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java

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

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

Write Preview
Loading…
Cancel
Save