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/TResultWorkEvaluateController.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 61a872d..5e45069 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
@@ -157,7 +157,7 @@
@Log(title = "实验结果工作评定管理-删除化验师、实验员工作评定", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除化验师、实验员工作评定")
@DeleteMapping(value = "/open/t-result-work-evaluate/deleteById")
- public R<Boolean> deleteById(@RequestBody String id) {
+ public R<Boolean> deleteById(@RequestParam String id) {
tResultWorkEvaluateService.removeById(id);
return R.ok();
}
@@ -285,11 +285,12 @@
TResultWorkEvaluateQuery query = JSON.parseObject(param, TResultWorkEvaluateQuery.class);
SysUser sysUser = sysUserService.selectUserById(loginUser.getUser().getUserId());
if (sysUser.getRoleType() != 1) {
- List<String> collect = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, loginUser.getUser().getUserId()).list()
+ List<String> teamIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, loginUser.getUser().getUserId()).list()
.stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
- if (collect.isEmpty()) {
+ if (teamIds.isEmpty()) {
return R.ok(new PageInfo<>());
}
+ query.setTeamIds(teamIds);
}
return R.ok(tResultWorkEvaluateService.pageList(query));
}
@@ -507,14 +508,16 @@
TResultWorkEvaluate resultWorkEvaluate = tResultWorkEvaluateService.getById(id);
TProjectTeam projectTeam = projectTeamService.getById(resultWorkEvaluate.getTeamId());
- TProjectTeamStaff one = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).eq(TProjectTeamStaff::getRoleType, 3).last("limit 1")
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).eq(TProjectTeamStaff::getRoleType, 3).last("limit 1")
+ .one();
+ TProjectTeamStaff projectTeamStaff1 = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).eq(TProjectTeamStaff::getRoleType, 2).last("limit 1")
.one();
tResultWorkEvaluateDetailVO.setStartTime(projectTeam.getCreateTime());
- Long userId = one.getUserId();
-
+ Long userId = projectTeamStaff.getUserId();
+ Long auditUserId = projectTeamStaff1.getUserId();
List<TFeasibilityStudyReport> total = feasibilityStudyReportService.lambdaQuery()
.eq(TFeasibilityStudyReport::getStatus, 3)
- .eq(TFeasibilityStudyReport::getEvaluatePersonId, userId).list();
+ .eq(TFeasibilityStudyReport::getEvaluatePersonId, auditUserId).list();
List<TResultWorkEvaluateDetailEngineerVO> tResultWorkEvaluateDetailEngineerVOS = new ArrayList<>();
// 工艺可研
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO = new TResultWorkEvaluateDetailEngineerVO();
@@ -531,8 +534,8 @@
tResultWorkEvaluateDetailEngineerVO.setIntegral(tempDetail);
if (!collect.isEmpty()) {
tResultWorkEvaluateDetailEngineerVO.setEndTime(collect.get(collect.size() - 1).getEvaluateTime());
+ tResultWorkEvaluateDetailEngineerVO.setStartTime(projectTeam.getCreateTime());
}
- tResultWorkEvaluateDetailEngineerVO.setStartTime(projectTeam.getCreateTime());
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO);
// 工艺可行
@@ -868,6 +871,7 @@
tResultWorkEvaluateDetailEngineerVO8.setStartTime(list6.get(0).getCreateTime());
tResultWorkEvaluateDetailEngineerVO8.setEndTime(list6.get(list6.size() - 1).getCreateTime());
}
+ tResultWorkEvaluateDetailEngineerVO8.setIntegral(list6.get(0).getEvaluateScore());
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO8);
tResultWorkEvaluateDetailVO.setEngineerList(tResultWorkEvaluateDetailEngineerVOS);
return R.ok(tResultWorkEvaluateDetailVO);
@@ -882,7 +886,7 @@
TProjectTeam projectTeam = projectTeamService.getById(resultWorkEvaluate.getTeamId());
tResultWorkEvaluateDetailVO.setStartTime(projectTeam.getCreateTime());
List<Long> role5 = projectTeamStaffService.lambdaQuery()
- .eq(TProjectTeamStaff::getRoleType, 5).eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).list()
+ .eq(TProjectTeamStaff::getRoleType, 4).eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).list()
.stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
List<SysUser> user5 = new ArrayList<>();
SysUser sysUser1 = sysUserService.selectUserById(tokenService.getLoginUser().getUserId());
@@ -1240,7 +1244,7 @@
tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO6);
// 产品
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO7 = new TResultWorkEvaluateDetailEngineerVO();
- List<TQaProduceReport> collect9 = list.stream().filter(e -> e.getReportType() == 1).collect(Collectors.toList());
+ List<TQaProduceReport> collect9 = list.stream().filter(e -> e.getReportType() == 3).collect(Collectors.toList());
if (!collect9.isEmpty()) {
tResultWorkEvaluateDetailEngineerVO7.setStartTime(collect9.get(0).getEvaluateTime());
tResultWorkEvaluateDetailEngineerVO7.setEndTime(collect9.get(collect9.size() - 1).getEvaluateTime());
@@ -1273,7 +1277,7 @@
TProjectTeam projectTeam = projectTeamService.getById(resultWorkEvaluate.getTeamId());
tResultWorkEvaluateDetailVO.setStartTime(projectTeam.getCreateTime());
List<Long> role5 = projectTeamStaffService.lambdaQuery()
- .eq(TProjectTeamStaff::getRoleType, 4).eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).list()
+ .eq(TProjectTeamStaff::getRoleType, 5).eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).list()
.stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
List<SysUser> user5 = new ArrayList<>();
SysUser sysUser1 = sysUserService.selectUserById(tokenService.getLoginUser().getUserId());
@@ -1573,8 +1577,8 @@
TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO5 = new TResultWorkEvaluateDetailEngineerVO();
tResultWorkEvaluateDetailEngineerVO5.setCount(list.size());
if (!list.isEmpty()) {
- tResultWorkEvaluateDetailEngineerVO5.setStartTime(list.get(0).getEvaluateTime());
- tResultWorkEvaluateDetailEngineerVO5.setEndTime(list.get(list.size() - 1).getEvaluateTime());
+ tResultWorkEvaluateDetailEngineerVO5.setStartTime(list.get(0).getCreateTime());
+ tResultWorkEvaluateDetailEngineerVO5.setEndTime(list.get(list.size() - 1).getCreateTime());
}
int temp = 0;
@@ -1582,7 +1586,7 @@
temp += tTesterOtherTask.getEvaluateScore();
}
tResultWorkEvaluateDetailEngineerVO5.setIntegral(temp);
- tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO4);
+ tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO5);
tResultWorkEvaluateDetailUserVO.setList(tResultWorkEvaluateDetailEngineerVOS);
tResultWorkEvaluateDetailUserVOS.add(tResultWorkEvaluateDetailUserVO);
}
--
Gitblit v1.7.1