From 2fa7f761cf80802f54f727381b282d3b264501a7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 08 十月 2026 11:11:26 +0800
Subject: [PATCH] 提交最新代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java | 104 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 72 insertions(+), 32 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
index 2e8e606..45f2b59 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TExperimentResultReportDTO;
import com.ruoyi.system.dto.TExperimentResultReportRejectDTO;
@@ -137,7 +138,7 @@
// 查询项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
.eq(TProjectTeamStaff::getUserId, userId)
- .eq(TProjectTeamStaff::getRoleType, 2));
+ .in(TProjectTeamStaff::getRoleType, 2,3));
if(!CollectionUtils.isEmpty(projectTeamStaffs)){
List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
// 查询分组
@@ -167,12 +168,6 @@
@PostMapping(value = "/api/t-experiment-result-report/add")
public R<Boolean> add(@RequestBody String param) {
TExperimentResultReportDTO dto = JSON.parseObject(param,TExperimentResultReportDTO.class);
- // 判断是否已存在实验结果
- Long count = experimentResultReportService.count(Wrappers.lambdaQuery(TExperimentResultReport.class)
- .eq(TExperimentResultReport::getDispatchId, dto.getDispatchId()));
- if(count > 0){
- return R.fail("已存在实验结果汇报");
- }
experimentResultReportService.save(dto);
// 获取当前用户的项目组id
Long userId = tokenService.getLoginUser().getUserId();
@@ -185,6 +180,14 @@
resultWorkEvaluate.setTeamId(projectTeamStaff.getTeamId());
}
resultWorkEvaluateService.saveOrUpdateBatch(resultWorkEvaluates);
+
+ // 查询实验调度
+ TExperimentDispatch dispatch = experimentDispatchService.getById(dto.getDispatchId());
+ if(Objects.nonNull(dispatch)){
+ // 修改结束时间
+ dispatch.setExperimentEndTime(LocalDateTime.now());
+ experimentDispatchService.updateById(dispatch);
+ }
// 查询项目组
TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
@@ -209,24 +212,41 @@
@PostMapping(value = "/api/t-experiment-result-report/update")
public R<Boolean> update(@RequestBody String param) {
TExperimentResultReportDTO dto = JSON.parseObject(param,TExperimentResultReportDTO.class);
+
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ dto.setStatus(null);
+ }
+
experimentResultReportService.updateById(dto);
// 修改实验结果工作评价
List<TResultWorkEvaluate> resultWorkEvaluates = dto.getResultWorkEvaluates();
resultWorkEvaluateService.saveOrUpdateBatch(resultWorkEvaluates);
+
// 获取当前用户的项目组id
Long userId = tokenService.getLoginUser().getUserId();
TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
.eq(TProjectTeamStaff::getUserId, userId));
+
+ // 查询实验调度
+ TExperimentDispatch dispatch = experimentDispatchService.getById(dto.getDispatchId());
+ if(Objects.nonNull(dispatch)){
+ // 修改结束时间
+ dispatch.setExperimentEndTime(LocalDateTime.now());
+ experimentDispatchService.updateById(dispatch);
+ }
+
// 查询项目组
- 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)){
- noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【实验结果汇报】等待评定", tokenService.getLoginUser().getUser().getNickName(),3);
+ if (projectTeamStaff != null) {
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ if(dto.getStatus() != null || 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)){
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【实验结果汇报】等待评定", tokenService.getLoginUser().getUser().getNickName(),3);
+ }
}
}
return R.ok();
@@ -242,29 +262,48 @@
public R<Boolean> evaluateProcess(@RequestBody String param) {
TResultWorkEvaluate resultWorkEvaluate = JSON.parseObject(param,TResultWorkEvaluate.class);
Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if (roleType != 1 && roleType != 2) {
+ return R.fail("仅管理员或审批人可以评定工艺工程师");
+ }
+ TExperimentResultReport experimentResultReport = experimentResultReportService.getById(resultWorkEvaluate.getResultReportId());
+ if (Objects.isNull(experimentResultReport)) {
+ return R.fail("实验结果汇报不存在");
+ }
+ if (!Objects.equals(experimentResultReport.getStatus(), 2)) {
+ return R.fail("当前实验结果汇报不是待评定状态");
+ }
+ long evaluatedCount = resultWorkEvaluateService.count(Wrappers.lambdaQuery(TResultWorkEvaluate.class)
+ .eq(TResultWorkEvaluate::getResultReportId, resultWorkEvaluate.getResultReportId())
+ .eq(TResultWorkEvaluate::getEvaluateType, 1)
+ .eq(TResultWorkEvaluate::getDisabled, 0));
+ if (evaluatedCount > 0) {
+ return R.fail("该工艺工程师工作评定已提交");
+ }
resultWorkEvaluate.setEvaluatePersonId(userId);
resultWorkEvaluate.setEvaluateTime(LocalDateTime.now());
resultWorkEvaluate.setStatus(1);
resultWorkEvaluate.setEvaluateType(1);
- // 查询当前用户组
- TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
- .eq(TProjectTeamStaff::getUserId, userId)
- .last("LIMIT 1"));
- if(Objects.isNull(projectTeamStaff)){
- return R.fail("当前用户未分配项目组,无法进行评定");
+ TExperimentDispatch dispatch = experimentDispatchService.getById(experimentResultReport.getDispatchId());
+ if (Objects.isNull(dispatch)) {
+ return R.fail("实验调度不存在");
}
- TProjectTeamStaff projectTeamStaff1 = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
- .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
- .eq(TProjectTeamStaff::getRoleType, 3)
- .last("LIMIT 1"));
- if(Objects.isNull(projectTeamStaff1)){
- return R.fail("当前项目组未分配工艺工程师,无法进行评定");
+ TProjectProposal proposal = projectProposalService.getById(dispatch.getProposalId());
+ if (Objects.isNull(proposal)) {
+ return R.fail("项目课题方案不存在");
}
- resultWorkEvaluate.setUserId(projectTeamStaff1.getUserId());
- resultWorkEvaluate.setTeamId(projectTeamStaff.getTeamId());
+ TExperimentDispatchParticipants processEngineer = experimentDispatchParticipantsService.getOne(
+ Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, dispatch.getId())
+ .eq(TExperimentDispatchParticipants::getRoleType, 3)
+ .last("LIMIT 1"));
+ if (Objects.isNull(processEngineer)) {
+ return R.fail("当前实验调度未分配工艺工程师,无法进行评定");
+ }
+ resultWorkEvaluate.setDispatchId(dispatch.getId());
+ resultWorkEvaluate.setUserId(processEngineer.getUserId());
+ resultWorkEvaluate.setTeamId(proposal.getTeamId());
resultWorkEvaluateService.save(resultWorkEvaluate);
- // 查询实验结果汇报
- TExperimentResultReport experimentResultReport = experimentResultReportService.getById(resultWorkEvaluate.getResultReportId());
experimentResultReport.setStatus(3);
experimentResultReportService.updateById(experimentResultReport);
return R.ok();
@@ -335,6 +374,7 @@
// 查询项目课题
TProjectProposal proposal = projectProposalService.getById(experimentDispatch.getProposalId());
experimentDispatchVO.setProjectName(proposal.getProjectName());
+ experimentDispatchVO.setProjectCode(proposal.getProjectCode());
// 查询参与人员
List<TExperimentDispatchParticipants> tExperimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
.eq(TExperimentDispatchParticipants::getDispatchId, experimentResultReport.getDispatchId()));
--
Gitblit v1.7.1