From 0b4f853f6b05b28e3201386bdda3e8af0bfcfc7f Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 20 五月 2025 09:28:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 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 6cf0a33..43cd077 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 @@ -3,12 +3,15 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.BaseModel; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; 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.model.*; import com.ruoyi.system.query.TQaTestItemReportQuery; import com.ruoyi.system.query.TResultWorkEvaluateQuery; @@ -30,12 +33,13 @@ /** * <p> - * 实验员工作评定 前端控制器 + * 实验结果工作评定 前端控制器 * </p> * * @author xiaochen * @since 2025-04-08 */ +@Api(tags = "实验结果工作评定管理") @RestController @RequestMapping("/t-result-work-evaluate") public class TResultWorkEvaluateController { @@ -66,6 +70,22 @@ this.projectTeamStaffService = projectTeamStaffService; this.sysUserService = sysUserService; } + + /** + * 添加QA检测项管理管理 + */ + //@PreAuthorize("@ss.hasPermi('system:resultWorkEvaluate:add')") + @Log(title = "QA检测项管理信息-新增QA检测项管理", businessType = BusinessType.INSERT) + @ApiOperation(value = "添加QA检测项管理",response = TQaTestItemDTO.class) + @PostMapping(value = "/api/t-qa-test-item/add") + public R<Boolean> add(@RequestBody String param) { + TQaTestItemDTO dto = JSON.parseObject(param,TQaTestItemDTO.class); +// resultWorkEvaluateService.save(dto); + return R.ok(); + } + + + @ApiOperation(value = "项目组总积分分页列表",tags = "项目组总积分",response = TQaTestItemReportQuery.class) @PostMapping(value = "/api/t-result-work-evaluate/pageList") public R<PageInfo<TResultWorkEvaluateVO>> pageList(@RequestBody String param) { -- Gitblit v1.7.1