From 8586161442cbe058fae93bfd35a468485b9b505e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 六月 2025 21:15:46 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java | 98 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 92 insertions(+), 6 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 29490ee..bb7e026 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
@@ -15,10 +15,7 @@
import com.ruoyi.system.dto.AuditStatusDTO;
import com.ruoyi.system.dto.TFeasibilityStudyReportDTO;
import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.model.TFeasibilityReportFile;
-import com.ruoyi.system.model.TFeasibilityStudyReport;
-import com.ruoyi.system.model.TProjectTeam;
-import com.ruoyi.system.model.TProjectTeamStaff;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TFeasibilityStudyReportQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TFeasibilityStudyReportVO;
@@ -55,8 +52,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 +62,7 @@
this.projectTeamStaffService = projectTeamStaffService;
this.sysUserService = sysUserService;
this.sysUserMapper = sysUserMapper;
+ this.noticeService = noticeService;
}
/**
@@ -206,6 +205,33 @@
}
}
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)){
+// TFeasibilityStudyReport feasibilityStudyReport = feasibilityStudyReportService.getById(dto.getId());
+ Integer reportType = dto.getReportType();
+ switch (reportType) {
+ case 1:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【可研报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),4);
+ break;
+ case 2:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【可行报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),4);
+ break;
+ case 3:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【工艺开发工具】等待评定", tokenService.getLoginUser().getUser().getNickName(),4);
+ break;
+ case 4:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【验证与发布】等待评定", tokenService.getLoginUser().getUser().getNickName(),4);
+ break;
+ default:
+ break;
+ }
+ }
+
return R.ok();
}
@@ -246,6 +272,40 @@
}
}
feasibilityReportFileService.saveBatch(feasibilityReportFiles);
+ // 通过当前用户查询项目组
+ Long userId = tokenService.getLoginUser().getUserId();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .last("LIMIT 1"));
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ if(dto.getStatus() != -1){
+ // 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)){
+ TFeasibilityStudyReport feasibilityStudyReport = feasibilityStudyReportService.getById(dto.getId());
+ Integer reportType = feasibilityStudyReport.getReportType();
+ switch (reportType) {
+ case 1:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【可研报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),4);
+ break;
+ case 2:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【可行报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),4);
+ break;
+ case 3:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【工艺开发工具】等待评定", tokenService.getLoginUser().getUser().getNickName(),4);
+ break;
+ case 4:
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【验证与发布】等待评定", tokenService.getLoginUser().getUser().getNickName(),4);
+ break;
+ default:
+ break;
+ }
+ }
+ }
return R.ok();
}
@@ -272,6 +332,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 +378,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 +399,24 @@
feasibilityStudyReport.setAuditPersonId(userId);
feasibilityStudyReport.setAuditTime(LocalDateTime.now());
feasibilityStudyReportService.updateById(feasibilityStudyReport);
+ // MESSAGE 添加消息
+ Integer reportType = feasibilityStudyReport.getReportType();
+ switch (reportType) {
+ case 1:
+ noticeService.saveNotice(userId, "您有【1】条【可研报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
+ break;
+ case 2:
+ noticeService.saveNotice(userId, "您有【1】条【可行报告】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
+ break;
+ case 3:
+ noticeService.saveNotice(userId, "您有【1】条【工艺开发工具】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
+ break;
+ case 4:
+ noticeService.saveNotice(userId, "您有【1】条【验证与发布】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
+ break;
+ default:
+ break;
+ }
return R.ok();
}
--
Gitblit v1.7.1