From 5852ab18f65d2f9d0e2a2bce20c1ca02428d8e45 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Fri, 17 Apr 2026 18:52:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=9A=E6=9D=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/Report/ReportFlowService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java b/src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java index 10b38ef..30cd563 100644 --- a/src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java +++ b/src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java @@ -480,8 +480,6 @@ public class ReportFlowService extends ServiceImpl @Transactional(rollbackFor = Exception.class) public Result auditEndWarning(WarningEndRequest queryParam) { ReportProject project = projectMapper.selectById(queryParam.getReportId()); - project.setWarningState(WarningStateEnum.YWJ.getCode()); - projectMapper.updateById(project); if (ObjectUtil.isNull(project)) { throw new RuntimeException("操作失败，没有找到对应项目"+ project.getReportName()); } @@ -510,8 +508,8 @@ public class ReportFlowService extends ServiceImpl endFlow.setReportCode(FlowWarningEnum.end.getValue()); endFlow.setAreportTime(LocalDateTime.now()); - endFlow.setApprover(currentUser.getUserName()); - endFlow.setApproverId(currentUser.getEmpNo()); + endFlow.setApprover(currentUser.getNickName()); + endFlow.setApproverId(currentUser.getUserName()); endFlow.setApproverUnit(currentUser.getDepartName()); endFlow.setApproverUnitId(currentUser.getDepartId()); @@ -526,14 +524,18 @@ public class ReportFlowService extends ServiceImpl WarningRecord warningRecord = warningRecordMapper.selectOne( new LambdaQueryWrapper() .eq(WarningRecord::getReportId, queryParam.getReportId()) + .orderByDesc(WarningRecord::getCreateTime) + .last("limit 1") ); if (warningRecord == null) { warningRecord = new WarningRecord(); warningRecord.setReportId(queryParam.getReportId()); + warningRecord.setWarningSupervision(currentUser.getNickName()); + warningRecord.setWarningSupervisionId(currentUser.getUserName()); warningRecord.setSupervisionTime(LocalDateTime.now()); warningRecord.setCreateTime(LocalDateTime.now()); warningRecordMapper.insert(warningRecord); - } else if (warningRecord.getSupervisionTime() == null) { + } else { warningRecord.setSupervisionTime(LocalDateTime.now()); warningRecordMapper.updateById(warningRecord); }