From c860cd39213a2e3b54cbe7f0a32d9aa0b8cd16d2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 20 八月 2025 09:31:40 +0800
Subject: [PATCH] 配置修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 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 83c6347..367cefc 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
@@ -53,6 +53,8 @@
@Resource
private TExperimentResultReportService experimentResultReportService;
@Resource
+ private TExperimentSchemeService experimentSchemeService;
+ @Resource
private TProjectApprovalReportService projectApprovalReportService;
@Resource
private TExperimentDispatchService experimentDispatchService;
@@ -157,7 +159,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();
}
@@ -475,7 +477,6 @@
switch (evaluateSix) {
case 1:
temp1 -= 3;
- temp5++;
if (tResultWorkEvaluate.getEvaluateType() == 1) {
temp2 -= 3;
}
@@ -492,9 +493,25 @@
tResultWorkEvaluateDetailVO.setEngineerIntegral(temp2);
tResultWorkEvaluateDetailVO.setChemistIntegral(temp3);
tResultWorkEvaluateDetailVO.setTesterIntegral(temp4);
- tResultWorkEvaluateDetailVO.setTermination(temp5);
if (!list.isEmpty()) {
tResultWorkEvaluateDetailVO.setEndTime(list.get(0).getEvaluateTime());
+ }
+ // 查询项目组总的失败次数
+ String teamId = resultWorkEvaluate.getTeamId();
+ List<String> projectProposalIds = projectProposalService.lambdaQuery().eq(TProjectProposal::getTeamId, teamId).list()
+ .stream().map(TProjectProposal::getId).collect(Collectors.toList());
+ if (projectProposalIds.isEmpty()){
+ tResultWorkEvaluateDetailVO.setTermination(0);
+ }else{
+ List<String> experimentDispatchIds = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, projectProposalIds).list()
+ .stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ if (experimentDispatchIds.isEmpty()){
+ tResultWorkEvaluateDetailVO.setTermination(0);
+ }else{
+ Long count = experimentSchemeService.lambdaQuery().in(TExperimentScheme::getDispatchId, experimentDispatchIds)
+ .eq(TExperimentScheme::getStatus, 3).count();
+ tResultWorkEvaluateDetailVO.setTermination(count.intValue());
+ }
}
return R.ok(tResultWorkEvaluateDetailVO);
@@ -508,14 +525,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();
@@ -532,8 +551,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);
// 工艺可行
@@ -869,6 +888,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);
@@ -883,7 +903,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());
@@ -1241,7 +1261,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());
@@ -1274,7 +1294,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());
@@ -1574,8 +1594,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;
@@ -1583,7 +1603,7 @@
temp += tTesterOtherTask.getEvaluateScore();
}
tResultWorkEvaluateDetailEngineerVO5.setIntegral(temp);
- tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO4);
+ tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO5);
tResultWorkEvaluateDetailUserVO.setList(tResultWorkEvaluateDetailEngineerVOS);
tResultWorkEvaluateDetailUserVOS.add(tResultWorkEvaluateDetailUserVO);
}
--
Gitblit v1.7.1