|
|
|
@ -480,8 +480,6 @@ public class ReportFlowService extends ServiceImpl<ReportFlowMapper,ReportFlow> |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Result<Boolean> auditEndWarning(WarningEndRequest queryParam) { |
|
|
|
public Result<Boolean> auditEndWarning(WarningEndRequest queryParam) { |
|
|
|
ReportProject project = projectMapper.selectById(queryParam.getReportId()); |
|
|
|
ReportProject project = projectMapper.selectById(queryParam.getReportId()); |
|
|
|
project.setWarningState(WarningStateEnum.YWJ.getCode()); |
|
|
|
|
|
|
|
projectMapper.updateById(project); |
|
|
|
|
|
|
|
if (ObjectUtil.isNull(project)) { |
|
|
|
if (ObjectUtil.isNull(project)) { |
|
|
|
throw new RuntimeException("操作失败,没有找到对应项目"+ project.getReportName()); |
|
|
|
throw new RuntimeException("操作失败,没有找到对应项目"+ project.getReportName()); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -510,8 +508,8 @@ public class ReportFlowService extends ServiceImpl<ReportFlowMapper,ReportFlow> |
|
|
|
endFlow.setReportCode(FlowWarningEnum.end.getValue()); |
|
|
|
endFlow.setReportCode(FlowWarningEnum.end.getValue()); |
|
|
|
endFlow.setAreportTime(LocalDateTime.now()); |
|
|
|
endFlow.setAreportTime(LocalDateTime.now()); |
|
|
|
|
|
|
|
|
|
|
|
endFlow.setApprover(currentUser.getUserName()); |
|
|
|
endFlow.setApprover(currentUser.getNickName()); |
|
|
|
endFlow.setApproverId(currentUser.getEmpNo()); |
|
|
|
endFlow.setApproverId(currentUser.getUserName()); |
|
|
|
endFlow.setApproverUnit(currentUser.getDepartName()); |
|
|
|
endFlow.setApproverUnit(currentUser.getDepartName()); |
|
|
|
endFlow.setApproverUnitId(currentUser.getDepartId()); |
|
|
|
endFlow.setApproverUnitId(currentUser.getDepartId()); |
|
|
|
|
|
|
|
|
|
|
|
@ -526,14 +524,18 @@ public class ReportFlowService extends ServiceImpl<ReportFlowMapper,ReportFlow> |
|
|
|
WarningRecord warningRecord = warningRecordMapper.selectOne( |
|
|
|
WarningRecord warningRecord = warningRecordMapper.selectOne( |
|
|
|
new LambdaQueryWrapper<WarningRecord>() |
|
|
|
new LambdaQueryWrapper<WarningRecord>() |
|
|
|
.eq(WarningRecord::getReportId, queryParam.getReportId()) |
|
|
|
.eq(WarningRecord::getReportId, queryParam.getReportId()) |
|
|
|
|
|
|
|
.orderByDesc(WarningRecord::getCreateTime) |
|
|
|
|
|
|
|
.last("limit 1") |
|
|
|
); |
|
|
|
); |
|
|
|
if (warningRecord == null) { |
|
|
|
if (warningRecord == null) { |
|
|
|
warningRecord = new WarningRecord(); |
|
|
|
warningRecord = new WarningRecord(); |
|
|
|
warningRecord.setReportId(queryParam.getReportId()); |
|
|
|
warningRecord.setReportId(queryParam.getReportId()); |
|
|
|
|
|
|
|
warningRecord.setWarningSupervision(currentUser.getNickName()); |
|
|
|
|
|
|
|
warningRecord.setWarningSupervisionId(currentUser.getUserName()); |
|
|
|
warningRecord.setSupervisionTime(LocalDateTime.now()); |
|
|
|
warningRecord.setSupervisionTime(LocalDateTime.now()); |
|
|
|
warningRecord.setCreateTime(LocalDateTime.now()); |
|
|
|
warningRecord.setCreateTime(LocalDateTime.now()); |
|
|
|
warningRecordMapper.insert(warningRecord); |
|
|
|
warningRecordMapper.insert(warningRecord); |
|
|
|
} else if (warningRecord.getSupervisionTime() == null) { |
|
|
|
} else { |
|
|
|
warningRecord.setSupervisionTime(LocalDateTime.now()); |
|
|
|
warningRecord.setSupervisionTime(LocalDateTime.now()); |
|
|
|
warningRecordMapper.updateById(warningRecord); |
|
|
|
warningRecordMapper.updateById(warningRecord); |
|
|
|
} |
|
|
|
} |
|
|
|
|