From ab1ee320981dfef77d3b25862a73e3459ab82018 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Tue, 5 Aug 2025 11:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=AF=84=E5=88=86-CRUD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HuzhouPerformancescoreController.java | 9 ++- .../HuzhouProjectassessmentController.java | 68 +++++++++++++++++-- .../mapping/HuzhouProjectassessmentMapper.xml | 2 +- .../IHuzhouProjectassessmentService.java | 4 ++ .../impl/HuzhouProjectassessmentService.java | 37 ++++++++-- .../huzhou/vo/HuzhouProjectassessmentOV.java | 4 ++ .../modules/huzhou/vo/SubmitRatingVo.java | 14 +++- 7 files changed, 125 insertions(+), 13 deletions(-) diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPerformancescoreController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPerformancescoreController.java index 1571755..02a7509 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPerformancescoreController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPerformancescoreController.java @@ -7,6 +7,7 @@ import com.easy.admin.common.core.config.ExecutorConfig; import com.easy.admin.modules.huzhou.entity.HuzhouPerforman; import com.easy.admin.modules.huzhou.entity.HuzhouPerformancescore; import com.easy.admin.modules.huzhou.service.IHuzhouPerformancescoreService; +import com.easy.admin.modules.huzhou.vo.SubmitRatingVo; import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,11 +37,16 @@ public class HuzhouPerformancescoreController { public List getPerformancescore(String type){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HuzhouPerformancescore::getType,type); - // 模板都是null + // 如果是模板则为null queryWrapper.isNull(HuzhouPerformancescore::getAssessmentId); return performancescoreService.list(queryWrapper); } + /** + * 根据考核记录id获取评分详情 + * @param assessmentId + * @return + */ @GetMapping("/getPerformanceScoreByAssessmentId") public List getPerformanceScoreByAssessmentId(String assessmentId){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -72,4 +78,5 @@ public class HuzhouPerformancescoreController { } + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java index 72dbed5..77cab2c 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java @@ -1,25 +1,34 @@ package com.easy.admin.modules.huzhou.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easy.admin.common.api.vo.Result; import com.easy.admin.common.core.annotation.ResponseResult; +import com.easy.admin.modules.huzhou.entity.HuzhouPerformancescore; import com.easy.admin.modules.huzhou.entity.HuzhouProjectassessment; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; +import com.easy.admin.modules.huzhou.service.IHuzhouPerformancescoreService; import com.easy.admin.modules.huzhou.service.IHuzhouProjectassessmentService; import com.easy.admin.modules.huzhou.vo.SubmitRatingVo; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.util.List; - +@Slf4j @RestController @RequestMapping("/huzhouProjectassessment") @ResponseResult public class HuzhouProjectassessmentController { @Autowired private IHuzhouProjectassessmentService projectassessmentService; + @Autowired + private IHuzhouPerformancescoreService performancescoreService; + + //新增项目考核查询内容,包含系统评分 @GetMapping("/getProjectassessmentIncludeSys") public List getPerformancescore(String type,String projectId){ @@ -80,12 +89,63 @@ public class HuzhouProjectassessmentController { * @return */ @DeleteMapping("{id}") - public Result submitRating(@PathVariable String id) { + public Result deleteRating(@PathVariable String id) { boolean flag = projectassessmentService.removeById(id); if (flag) { - return Result.ok("删除成功"); + return Result.ok("删除评分记录成功"); }else { - return Result.error("删除失败"); + return Result.error("删除评分记录失败!"); } } + + + @DeleteMapping("deleteRatingDetail") + public Result deleteRatingDetail(@Param("assessmentId") String assessmentId) { + boolean flag = projectassessmentService.deleteRatingDetail(assessmentId); + if (flag) { + return Result.ok("删除评分详情成功"); + }else { + return Result.error("删除评分详情失败!"); + } + } + + + /** + * 修改评分详情 + * @param submitRatingVo + * @return + */ + @PutMapping("updateRatingDetail") + public Result updateRatingDetail(@RequestBody SubmitRatingVo submitRatingVo) { + try { + projectassessmentService.updateRatingDetail(submitRatingVo); + return Result.ok("修改评分详情成功"); + } catch (Exception e) { + log.error("更新评分详情失败", e); + return Result.error("系统异常，请稍后重试"); + } + } + + + + /** + * 根据考核记录id获取评分详情 + * @param id + * @return + */ + @GetMapping("/getRatingDetail") + public Result getRatingDetail(@Param("id") String id) { + SubmitRatingVo submitRatingVo = new SubmitRatingVo(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouPerformancescore::getAssessmentId, id); + List list = performancescoreService.list(queryWrapper); + HuzhouProjectassessment projectassessment = projectassessmentService.getById(id); + submitRatingVo.setPerformancescoreList(list); + submitRatingVo.setProjectName(projectassessment.getProjectName()); + submitRatingVo.setProjectId(projectassessment.getProjectId()); + submitRatingVo.setTemplateName(projectassessment.getDescription()); + submitRatingVo.setAssessmentId(id); + submitRatingVo.setTemplateId(projectassessment.getType()); + return Result.ok(submitRatingVo); + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml index d5849eb..172b90e 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml @@ -38,7 +38,7 @@