Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 bd953391a74b86db829df43992c7cf3c5207634b

 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();
    }