From 01f041d3793ea7f9f6828e0fe748ef9b1eb2e501 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Mon, 4 Aug 2025 17:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=84=E5=88=86=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HuzhouPerformancescoreController.java       |  4 ++--
 .../HuzhouProjectassessmentController.java      | 17 +++++++++++++++--
 .../mapping/HuzhouProjectassessmentMapper.xml   |  2 +-
 .../huzhou/vo/HuzhouProjectassessmentOV.java    |  2 ++
 4 files changed, 20 insertions(+), 5 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 2263d79..1571755 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
@@ -42,9 +42,9 @@ public class HuzhouPerformancescoreController {
     }
 
     @GetMapping("/getPerformanceScoreByAssessmentId")
-    public List<HuzhouPerformancescore> getPerformanceScoreByAssessmentId(String AssessmentId){
+    public List<HuzhouPerformancescore> getPerformanceScoreByAssessmentId(String assessmentId){
         LambdaQueryWrapper<HuzhouPerformancescore> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(HuzhouPerformancescore::getAssessmentId,AssessmentId);
+        queryWrapper.eq(HuzhouPerformancescore::getAssessmentId,assessmentId);
         return performancescoreService.list(queryWrapper);
     }
 
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 6df2343..72dbed5 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,10 +1,8 @@
 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.IHuzhouProjectassessmentService;
@@ -75,4 +73,19 @@ public class HuzhouProjectassessmentController {
         projectassessmentService.submitRating(submitRatingVo);
         return Result.ok("成功");
     }
+
+    /**
+     * 删除评分记录
+     * @param id
+     * @return
+     */
+    @DeleteMapping("{id}")
+    public Result<?> submitRating(@PathVariable String id) {
+        boolean flag = projectassessmentService.removeById(id);
+        if (flag) {
+            return Result.ok("删除成功");
+        }else {
+            return Result.error("删除失败");
+        }
+    }
 }
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 e3d0332..d5849eb 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 @@
 
 
     <select id="getProjectassessmentPageList" resultType="com.easy.admin.modules.huzhou.vo.HuzhouProjectassessmentOV" parameterType="com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo">
-        SELECT u.id project_id,u.project_name,u.admin_division,u.duty_workplace,u.workplace_properties,u.reform_name,u.super_leader,
+        SELECT h.id,u.id as projectId,u.project_name,u.admin_division,u.duty_workplace,u.workplace_properties,u.reform_name,u.super_leader,
         h.pscores
         from huzhou_sub_projectinfo u inner join
         huzhou_projectassessment h on h.project_id=u.id
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouProjectassessmentOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouProjectassessmentOV.java
index ff994a2..1e55089 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouProjectassessmentOV.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouProjectassessmentOV.java
@@ -4,6 +4,8 @@ import lombok.Data;
 
 @Data
 public class HuzhouProjectassessmentOV {
+    private String id;
+
     private String projectId;
     /**
      * 项目名称