增加自我评分和任务牵头处室评分逻辑

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>

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;

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);

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;
+
     /**
      * 任务牵头处室评分
      */

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;
 }