From 0c989fbcca1cd4b53d59e8ba288227a5a68d92a4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 18:08:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/laboratory
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java
index a755792..e60b152 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java
@@ -284,6 +284,14 @@
List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
feasibilityStudyReportVO.setStaffNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
feasibilityStudyReportVO.setProjectTeam(projectTeam);
+ SysUser sysUser = sysUserService.selectUserById(feasibilityStudyReport.getAuditPersonId());
+ if(Objects.nonNull(sysUser)){
+ feasibilityStudyReportVO.setAuditPersonName(sysUser.getNickName());
+ }
+ SysUser sysUser1 = sysUserService.selectUserById(feasibilityStudyReport.getEvaluatePersonId());
+ if(Objects.nonNull(sysUser1)){
+ feasibilityStudyReportVO.setEvaluatePersonName(sysUser.getNickName());
+ }
return R.ok(feasibilityStudyReportVO);
}
@@ -322,7 +330,7 @@
@PutMapping(value = "/open/t-feasibility-study-report/revokedReport")
public R<Boolean> revokedReport(@RequestParam String id) {
TFeasibilityStudyReport feasibilityStudyReport = feasibilityStudyReportService.getById(id);
- feasibilityStudyReport.setStatus(FeasibilityStudyReportStatusEnum.REVOKED.getCode());
+ feasibilityStudyReport.setStatus(FeasibilityStudyReportStatusEnum.DRAFTS.getCode());
feasibilityStudyReportService.updateById(feasibilityStudyReport);
return R.ok();
}
--
Gitblit v1.7.1