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/TResultWorkEvaluateController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java
index dff9950..258e076 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java
@@ -498,7 +498,7 @@
List<TResultWorkEvaluate> tResultWorkEvaluateList = tResultWorkEvaluateService.lambdaQuery()
.eq(TResultWorkEvaluate::getUserId, sysUser.getUserId())
.eq(TResultWorkEvaluate::getTeamId, projectTeam.getId())
- .eq(TResultWorkEvaluate::getEvaluateType, 1)//工艺工程师
+ .eq(TResultWorkEvaluate::getEvaluateType, 2)//化验师
.eq(TResultWorkEvaluate::getDisabled, 0)//未删除
.orderByAsc(TResultWorkEvaluate::getEvaluateTime)
.list();
@@ -508,7 +508,9 @@
// 项目检测项评定
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO9 = new TResultWorkEvaluateDetailEngineerVO();
List<TQaTestItem> list5 = qaTestItemService.lambdaQuery()
- .eq(TQaTestItem::getStatus,3).eq(TQaTestItem::getCommitPersonId, sysUser.getUserId()).list();
+ .eq(TQaTestItem::getStatus,3)
+ .eq(TQaTestItem::getTeamId, projectTeam.getId())
+ .eq(TQaTestItem::getCommitPersonId, sysUser.getUserId()).list();
if (!list5.isEmpty()){
tResultWorkEvaluateDetailEngineerVO9.setStartTime(list5.get(0).getEvaluateTime());
tResultWorkEvaluateDetailEngineerVO9.setEndTime(list5.get(list5.size() - 1).getCreateTime());
@@ -526,7 +528,9 @@
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO9);
// 中试、生产验证试验检验分析报告评定
List<TQaProduceReport> list = qaProduceReportService.lambdaQuery()
- .eq(TQaProduceReport::getStatus,3).eq(TQaProduceReport::getCommitPersonId, sysUser.getUserId()).list();
+ .eq(TQaProduceReport::getStatus,3)
+ .eq(TQaProduceReport::getTeamId, projectTeam.getId())
+ .eq(TQaProduceReport::getCommitPersonId, sysUser.getUserId()).list();
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO5 = new TResultWorkEvaluateDetailEngineerVO();
List<TQaProduceReport> collect3 = list.stream().filter(e -> e.getReportType() == 1).collect(Collectors.toList());
if (!collect3.isEmpty()) {
@@ -623,7 +627,7 @@
List<TResultWorkEvaluate> tResultWorkEvaluateList = tResultWorkEvaluateService.lambdaQuery()
.eq(TResultWorkEvaluate::getUserId, sysUser.getUserId())
.eq(TResultWorkEvaluate::getTeamId, projectTeam.getId())
- .eq(TResultWorkEvaluate::getEvaluateType, 1)//工艺工程师
+ .eq(TResultWorkEvaluate::getEvaluateType, 3)//实验员
.eq(TResultWorkEvaluate::getDisabled, 0)//未删除
.orderByAsc(TResultWorkEvaluate::getEvaluateTime)
.list();
@@ -631,7 +635,11 @@
workEvaluateCalculateService.getThreeScope(tResultWorkEvaluateList, tResultWorkEvaluateDetailEngineerVOS);
// 其他任务
- List<TTesterOtherTask> list = tTesterOtherTaskService.lambdaQuery().eq(TTesterOtherTask::getTesterId, sysUser.getUserId()).list();
+ List<TTesterOtherTask> list = tTesterOtherTaskService.lambdaQuery()
+ .eq(TTesterOtherTask::getTesterId, sysUser.getUserId())
+ .eq(TTesterOtherTask::getTeamId, projectTeam.getId())
+ .orderByAsc(TTesterOtherTask::getCreateTime)
+ .list();
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO5 = new TResultWorkEvaluateDetailEngineerVO();
tResultWorkEvaluateDetailEngineerVO5.setCount(list.size());
if (!list.isEmpty()) {
@@ -641,7 +649,9 @@
}
int temp = 0;
for (TTesterOtherTask tTesterOtherTask : list) {
- temp += tTesterOtherTask.getEvaluateScore();
+ if (tTesterOtherTask.getEvaluateScore() != null) {
+ temp += tTesterOtherTask.getEvaluateScore();
+ }
}
tResultWorkEvaluateDetailEngineerVO5.setIntegral(temp);
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO5);
--
Gitblit v1.7.1