bug修改

xuhy

2 天以前 b7ec3aff011f05e236e76be844540dbe776f7353

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java

@@ -55,8 +55,9 @@
    private final TProjectTeamStaffService projectTeamStaffService;
    private final ISysUserService sysUserService;
    private final SysUserMapper sysUserMapper;
    private final TNoticeService noticeService;
    @Autowired
    public TFeasibilityStudyReportController(TFeasibilityStudyReportService feasibilityStudyReportService, TFeasibilityReportFileService feasibilityReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, SysUserMapper sysUserMapper) {
    public TFeasibilityStudyReportController(TFeasibilityStudyReportService feasibilityStudyReportService, TFeasibilityReportFileService feasibilityReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TNoticeService noticeService) {
        this.feasibilityStudyReportService = feasibilityStudyReportService;
        this.feasibilityReportFileService = feasibilityReportFileService;
        this.tokenService = tokenService;
@@ -64,6 +65,7 @@
        this.projectTeamStaffService = projectTeamStaffService;
        this.sysUserService = sysUserService;
        this.sysUserMapper = sysUserMapper;
        this.noticeService = noticeService;
    }

    /**
@@ -129,7 +131,7 @@
            }
        }
        Map<String,Integer> map = feasibilityStudyReportService.evaluateCount(query);
        return R.ok();
        return R.ok(map);
    }

    /**
@@ -206,6 +208,16 @@
            }
        }
        feasibilityReportFileService.saveBatch(feasibilityReportFiles);

        // MESSAGE 添加消息
        TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
                .eq(TProjectTeamStaff::getRoleType, 2)
                .last("LIMIT 1"));
        if(Objects.nonNull(teamStaff)){
            noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【可研报告】/【可行报告】/【工艺开发工具】/【验证与发布】/【立项报告库】等待审核", tokenService.getLoginUser().getUser().getNickName(),4);
        }

        return R.ok();
    }

@@ -272,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);
    }

@@ -310,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();
    }
@@ -331,6 +351,9 @@
        feasibilityStudyReport.setAuditPersonId(userId);
        feasibilityStudyReport.setAuditTime(LocalDateTime.now());
        feasibilityStudyReportService.updateById(feasibilityStudyReport);
        // MESSAGE 添加消息
        noticeService.saveNotice(userId, "您有【1】条【可研报告】/【可行报告】/【工艺开发工具】/【验证与发布】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);

        return R.ok();
    }