From 47677c0416d018744d4c3f1796d59849a0bdd6f6 Mon Sep 17 00:00:00 2001
From: mythxb <mythxb@qq.com>
Date: Mon, 8 Apr 2024 13:52:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=84=E5=88=86=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/rzyc/bean/ex/vo/StandardInfo.java     | 11 +++++++
 .../main/java/com/rzyc/enums/ScoreState.java  | 29 +++++++++++++++++++
 .../main/java/com/rzyc/model/ex/ExScore.java  | 12 ++++++++
 .../resources/mapper/ex/ExScoreMapper.xml     |  4 ++-
 .../resources/mapper/ex/ExStandardMapper.xml  |  3 +-
 .../rzyc/controller/ExamineController.java    | 26 +++++++++++++++++
 6 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 inventory-dao/src/main/java/com/rzyc/enums/ScoreState.java

diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java
index 330b9d4..23f228f 100644
--- a/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java
+++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java
@@ -78,9 +78,20 @@ public class StandardInfo {
     @ApiModelProperty("意见建议")
     private String opinion;
 
+    @ApiModelProperty("评分状态 1、已评分 2、未评分")
+    private Integer socreState;
+
     @ApiModelProperty("附件")
     private List<ExScoreFile> scoreFiles;
 
+    public Integer getSocreState() {
+        return socreState;
+    }
+
+    public void setSocreState(Integer socreState) {
+        this.socreState = socreState;
+    }
+
     public List<ExScoreFile> getScoreFiles() {
         return scoreFiles;
     }
diff --git a/inventory-dao/src/main/java/com/rzyc/enums/ScoreState.java b/inventory-dao/src/main/java/com/rzyc/enums/ScoreState.java
new file mode 100644
index 0000000..c0deab1
--- /dev/null
+++ b/inventory-dao/src/main/java/com/rzyc/enums/ScoreState.java
@@ -0,0 +1,29 @@
+package com.rzyc.enums;
+
+/**
+ * 评分状态 1、已评分 2、未评分
+ * @version v1.0
+ * @author dong
+ * @date 2024/4/8 9:07
+ */
+public enum ScoreState {
+
+    //已评分
+    SCOREED(1),
+    //未评分
+    NOT_SCORE(2);
+
+    private Integer state;
+
+    ScoreState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}
diff --git a/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java
index bec97a0..0ab57b2 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java
@@ -50,6 +50,10 @@ public class ExScore implements Serializable {
     @TableField("user_id")
     private String userId;
 
+    @ApiModelProperty(value = "评分状态 1、已评分 2、未评分")
+    @TableField("socre_state")
+    private Integer socreState;
+
     @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     private Date createTime;
@@ -66,6 +70,14 @@ public class ExScore implements Serializable {
     @TableField("modify_by")
     private String modifyBy;
 
+    public Integer getSocreState() {
+        return socreState;
+    }
+
+    public void setSocreState(Integer socreState) {
+        this.socreState = socreState;
+    }
+
     public String getSocreId() {
         return socreId;
     }
diff --git a/inventory-dao/src/main/resources/mapper/ex/ExScoreMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExScoreMapper.xml
index e2b6bf1..03cba9d 100644
--- a/inventory-dao/src/main/resources/mapper/ex/ExScoreMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ex/ExScoreMapper.xml
@@ -11,6 +11,7 @@
         <result column="socre_num" property="socreNum" />
         <result column="opinion" property="opinion" />
         <result column="user_id" property="userId" />
+        <result column="socre_state" property="socreState" />
         <result column="create_time" property="createTime" />
         <result column="create_by" property="createBy" />
         <result column="modify_time" property="modifyTime" />
@@ -19,7 +20,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        socre_id, examine_id, standard_id, perform_id, socre_num, opinion, user_id, create_time, create_by, modify_time, modify_by
+        socre_id, examine_id, standard_id, perform_id, socre_num,
+        opinion, user_id, socre_state,create_time, create_by, modify_time, modify_by
     </sql>
 
     <!--部门评分信息-->
diff --git a/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml
index de3f607..0db2291 100644
--- a/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml
@@ -90,6 +90,7 @@
         <result column="socre_id" property="socreId" />
         <result column="socre_num" property="socreNum" />
         <result column="opinion" property="opinion" />
+        <result column="socre_state" property="socreState" />
         <collection property="scoreFiles" ofType="com.rzyc.model.ex.ExScoreFile" column="socre_id">
             <result column="file_id" property="fileId" />
             <result column="file_name" property="fileName" />
@@ -101,7 +102,7 @@
     <!--标准评分信息-->
     <select id="standardScoreList" resultMap="UnitStandardResultMap">
         SELECT
-            es.*,sc.`socre_id`,sc.`socre_num`,sc.`opinion`,
+            es.*,sc.`socre_id`,sc.`socre_num`,sc.`opinion`,sc.socre_state,
             sf.`file_id`,sf.`file_name`,sf.`file_path`,sf.`remarks`
         FROM ex_standard es
                  LEFT JOIN `ex_score` sc ON es.`standard_id` = sc.`standard_id`
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java
index 4003f6d..88def70 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java
@@ -11,6 +11,7 @@ import com.rzyc.bean.ex.vo.StandardInfo;
 import com.rzyc.enums.DelState;
 import com.rzyc.enums.ExItemType;
 import com.rzyc.enums.ExamineState;
+import com.rzyc.enums.ScoreState;
 import com.rzyc.model.ex.*;
 import com.rzyc.model.user.ListPerform;
 import io.swagger.annotations.Api;
@@ -534,6 +535,12 @@ public class ExamineController extends BaseController{
     private void handleStandardInfo(List<StandardInfo> standards,Map<String,String> examineItemMap)throws Exception{
         if(null != standards && standards.size() > 0){
             for (StandardInfo standard : standards){
+
+
+                if(null == standard.getSocreState()){
+                    standard.setSocreState(ScoreState.NOT_SCORE.getState());
+                }
+
                 String[] strs = standard.getItemPath().split(",");
                 if(null != strs && 3 == strs.length ){
                     //考核指标
@@ -570,6 +577,15 @@ public class ExamineController extends BaseController{
             Integer examineState = listPerform.getExamineState();
             //评分标准
             List<StandardInfo> standards = exStandardMapper.standardScoreList(ExItemType.BONUS_POINT.getType(),examineState,unitStandardDto.getExamineId(),unitId);
+            if(null != standards && standards.size() > 0){
+                for (StandardInfo standardInfo : standards){
+                    if(null == standardInfo.getSocreState()){
+                        standardInfo.setSocreState(ScoreState.NOT_SCORE.getState());
+                    }
+                }
+            }
+
+
             result.setData(standards);
         }
 
@@ -597,6 +613,13 @@ public class ExamineController extends BaseController{
             Integer examineState = listPerform.getExamineState();
             //评分标准
             List<StandardInfo> standards = exStandardMapper.standardScoreList(ExItemType.PERSONALITY.getType(),examineState,unitStandardDto.getExamineId(),unitId);
+            if(null != standards && standards.size() > 0){
+                for (StandardInfo standardInfo : standards){
+                    if(null == standardInfo.getSocreState()){
+                        standardInfo.setSocreState(ScoreState.NOT_SCORE.getState());
+                    }
+                }
+            }
             result.setData(standards);
         }
         return result;
@@ -653,6 +676,7 @@ public class ExamineController extends BaseController{
             exScore.setPerformId(unitId);
             exScore.setStandardId(exStandard.getStandardId());
             exScore.setSocreNum(SCORE_NUM);
+            exScore.setSocreState(ScoreState.NOT_SCORE.getState());
             exScore.setCreateTime(new Date());
             exScore.setModifyTime(new Date());
             exScore.setCreateBy(userId);
@@ -704,6 +728,7 @@ public class ExamineController extends BaseController{
                 exScore.setStandardId(standard.getStandardId());
                 exScore.setOpinion(itemRatingDto.getOpinion());
                 exScore.setSocreNum(itemRatingDto.getScore());
+                exScore.setSocreState(ScoreState.SCOREED.getState());
                 exScore.setCreateTime(new Date());
                 exScore.setModifyTime(new Date());
                 exScore.setCreateBy(itemRatingDto.getUserId());
@@ -714,6 +739,7 @@ public class ExamineController extends BaseController{
                 score.setSocreId(exScore.getSocreId());
                 score.setSocreNum(itemRatingDto.getScore());
                 score.setOpinion(itemRatingDto.getOpinion());
+                score.setSocreState(ScoreState.SCOREED.getState());
                 score.setModifyTime(new Date());
                 score.setModifyBy(itemRatingDto.getUserId());
                 exScoreMapper.updateById(score);