From 5a5ffd12890d31747a2e303377d05a12a43c9f88 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Wed, 6 Aug 2025 15:24:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E6=88=91=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=E5=92=8C=E4=BB=BB=E5=8A=A1=E7=89=B5=E5=A4=B4=E5=A4=84?=
 =?UTF-8?q?=E5=AE=A4=E8=AF=84=E5=88=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapping/HuzhouProjectassessmentMapper.xml |  3 ++-
 .../entity/HuzhouProjectassessment.java       |  1 +
 .../impl/HuzhouProjectassessmentService.java  | 24 ++++++++++++++++++-
 .../huzhou/vo/HuzhouProjectassessmentOV.java  |  3 +++
 .../modules/huzhou/vo/SubmitRatingVo.java     |  4 ++++
 5 files changed, 33 insertions(+), 2 deletions(-)

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 ccbe10e..ef2abb3 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
@@ -39,7 +39,7 @@
 
     <select id="getProjectassessmentPageList" resultType="com.easy.admin.modules.huzhou.vo.HuzhouProjectassessmentOV" parameterType="com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo">
         SELECT h.id,h.description,u.id as projectId,u.project_contacts,u.project_name,u.admin_division,u.duty_workplace,u.workplace_properties,u.reform_name,u.super_leader,
-        h.pscores
+        h.pscores,h.self_scores,h.document_name,h.document_path
         from huzhou_sub_projectinfo u inner join
         huzhou_projectassessment h on h.project_id=u.id
         <where>
@@ -70,5 +70,6 @@
             </if>
 
         </where>
+        order by h.edit_date desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java
index 2fc6ab1..986a5fe 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java
@@ -76,6 +76,7 @@ public class HuzhouProjectassessment extends BaseEntity implements Serializable
      */
     private String pscores;
 
+    //自评总分
     private String selfScores;
 
     private String documentName;
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectassessmentService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectassessmentService.java
index 8f2e263..284cbe3 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectassessmentService.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectassessmentService.java
@@ -1,6 +1,7 @@
 package com.easy.admin.modules.huzhou.service.impl;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -367,6 +368,11 @@ public class HuzhouProjectassessmentService extends ServiceImpl<HuzhouProjectass
 
     @Override
     public void submitRating(SubmitRatingVo submitRatingVo) {
+        String selfScores = submitRatingVo.getSelfScores();
+        SysUser currentUser = ShiroUtil.getCurrentUser();
+        String userId = currentUser.getId();
+        List<String> codeList = roleService.selectRoleCodeByUserId(userId);
+
         String projectId = submitRatingVo.getProjectId();
         // 模板id
         String templateId = submitRatingVo.getTemplateId();
@@ -385,7 +391,18 @@ public class HuzhouProjectassessmentService extends ServiceImpl<HuzhouProjectass
             HuzhouProjectassessment projectAssessment = new HuzhouProjectassessment();
             BeanUtils.copyProperties(huzhouProjectassessmentOV,projectAssessment,"id");
             projectAssessment.setProjectId(projectId);
-            projectAssessment.setPscores(String.valueOf(totalRealScore));
+            // 牵头处室评分总分
+            if (!codeList.contains("projectContact") ){
+                projectAssessment.setPscores(String.valueOf(totalRealScore));
+            }
+
+            // 自我评分
+            if (codeList.contains("projectContact") ){
+                projectAssessment.setSelfScores(String.valueOf(totalRealScore));
+            }
+            if (StrUtil.isNotBlank(selfScores)){
+                projectAssessment.setSelfScores(String.valueOf(selfScores));
+            }
             // 模板名称
             projectAssessment.setDescription(huzhouPerforman.getName());
             // 模板id
@@ -419,6 +436,11 @@ public class HuzhouProjectassessmentService extends ServiceImpl<HuzhouProjectass
     @Override
     public void updateRatingDetail(SubmitRatingVo submitRatingVo) {
         String assessmentId = submitRatingVo.getAssessmentId();
+        HuzhouProjectassessment oldInfo = projectassessmentMapper.selectById(assessmentId);
+        if (oldInfo != null){
+            String selfScores = oldInfo.getSelfScores();
+            submitRatingVo.setSelfScores(selfScores);
+        }
 
         // 可选：判断删除是否成功
         boolean deleted = deleteRatingDetail(assessmentId);
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 59a83d8..3ff0a54 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
@@ -34,6 +34,9 @@ public class HuzhouProjectassessmentOV {
      */
     private String superLeader;
 
+    //自评总分
+    private String selfScores;
+
     /**
      * 任务牵头处室评分
      */
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SubmitRatingVo.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SubmitRatingVo.java
index 6329a55..9b08f26 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SubmitRatingVo.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SubmitRatingVo.java
@@ -35,4 +35,8 @@ public class SubmitRatingVo {
      * 评分项
      */
     List<HuzhouPerformancescore> performancescoreList;
+
+
+    //自评总分
+    private String selfScores;
 }