From eb727b22c1d04ee924d44c94272e4154d3e9e631 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 14:29:39 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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 4ff0175..2f888d1 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
@@ -11,12 +11,10 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.dto.TQaTestItemDTO;
import com.ruoyi.system.dto.TResultWorkEvaluateDTO;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.ResultEvaluateChemistTesterQuery;
import com.ruoyi.system.query.TProjectApprovalReportQuery;
-import com.ruoyi.system.query.TQaTestItemReportQuery;
import com.ruoyi.system.query.TResultWorkEvaluateQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
@@ -126,14 +124,39 @@
*/
//@PreAuthorize("@ss.hasPermi('system:resultWorkEvaluate:add')")
@Log(title = "实验结果工作评定管理-新增化验师、实验员工作评定", businessType = BusinessType.INSERT)
- @ApiOperation(value = "新增化验师、实验员工作评定", response = TQaTestItemDTO.class)
+ @ApiOperation(value = "新增化验师、实验员工作评定", response = TResultWorkEvaluateDTO.class)
@PostMapping(value = "/api/t-result-work-evaluate/add")
public R<Boolean> add(@RequestBody String param) {
TResultWorkEvaluateDTO dto = JSON.parseObject(param, TResultWorkEvaluateDTO.class);
-
tResultWorkEvaluateService.save(dto);
return R.ok();
}
+
+ /**
+ * 编辑化验师、实验员工作评定
+ */
+ //@PreAuthorize("@ss.hasPermi('system:resultWorkEvaluate:edit')")
+ @Log(title = "实验结果工作评定管理-编辑化验师、实验员工作评定", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "编辑化验师、实验员工作评定", response = TResultWorkEvaluateDTO.class)
+ @PostMapping(value = "/api/t-result-work-evaluate/edit")
+ public R<Boolean> edit(@RequestBody String param) {
+ TResultWorkEvaluateDTO dto = JSON.parseObject(param, TResultWorkEvaluateDTO.class);
+ tResultWorkEvaluateService.updateById(dto);
+ return R.ok();
+ }
+
+ /**
+ * 删除化验师、实验员工作评定
+ */
+ //@PreAuthorize("@ss.hasPermi('system:resultWorkEvaluate:delete')")
+ @Log(title = "实验结果工作评定管理-删除化验师、实验员工作评定", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除化验师、实验员工作评定")
+ @DeleteMapping(value = "/open/t-result-work-evaluate/deleteById")
+ public R<Boolean> deleteById(@RequestBody String id) {
+ tResultWorkEvaluateService.removeById(id);
+ return R.ok();
+ }
+
/**
* 查询可评定的化验师
@@ -151,7 +174,8 @@
List<SysUser> sysUsers = sysUserService.selectListByNameAndUserIds(nickName,userIds);
return R.ok(sysUsers);
}
- return R.ok();
+ List<SysUser> sysUsers = sysUserService.selectListByNameAndUserIds(null,userIds);
+ return R.ok(sysUsers);
}
/**
* 查询可评定的实验员
@@ -169,7 +193,8 @@
List<SysUser> sysUsers = sysUserService.selectListByNameAndUserIds(nickName,userIds);
return R.ok(sysUsers);
}
- return R.ok();
+ List<SysUser> sysUsers = sysUserService.selectListByNameAndUserIds(null,userIds);
+ return R.ok(sysUsers);
}
/**
@@ -200,7 +225,7 @@
}
- @ApiOperation(value = "项目组总积分分页列表", tags = "项目组总积分", response = TQaTestItemReportQuery.class)
+ @ApiOperation(value = "项目组总积分分页列表", tags = "项目组总积分", response = TResultWorkEvaluateQuery.class)
@PostMapping(value = "/api/t-result-work-evaluate/pageList")
public R<PageInfo<TResultWorkEvaluateVO>> pageList(@RequestBody String param) {
LoginUser loginUser = tokenService.getLoginUser();
@@ -221,7 +246,7 @@
* 查看取样记录详情
*/
//@PreAuthorize("@ss.hasPermi('system:samplingRecord:detail')")
- @ApiOperation(value = "查看详情-顶部数据")
+ @ApiOperation(value = "查看详情-顶部数据",response = TResultWorkEvaluateVO.class)
@GetMapping(value = "/open/t-result-work-evaluate/getDetailById")
public R<TResultWorkEvaluateDetailVO> getDetailById(@RequestParam String id) {
TResultWorkEvaluateDetailVO tResultWorkEvaluateDetailVO = new TResultWorkEvaluateDetailVO();
@@ -229,7 +254,6 @@
TResultWorkEvaluate resultWorkEvaluate = tResultWorkEvaluateService.getById(id);
TProjectTeam projectTeam = projectTeamService.getById(resultWorkEvaluate.getTeamId());
tResultWorkEvaluateDetailVO.setStartTime(projectTeam.getCreateTime());
- TProjectTeamStaff one = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).eq(TProjectTeamStaff::getRoleType, 3).last("limit 1").one();
List<Long> role4 = projectTeamStaffService.lambdaQuery()
.eq(TProjectTeamStaff::getRoleType, 4).eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).list()
.stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
--
Gitblit v1.7.1