From 487b1d8e703022f09ab1bbc08202278f33ee8e28 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 27 Jan 2024 23:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=A2=AB=E8=80=83=E6=A0=B8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/supervise/vo/api/BeIndicatorsVO.java   | 8 +++++---
 .../java/com/logpm/supervise/mapper/IndicatorsMapper.java | 2 +-
 .../java/com/logpm/supervise/mapper/IndicatorsMapper.xml  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java
index c46512e13..450ef1ee2 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java
@@ -13,9 +13,11 @@ import java.util.List;
 public class BeIndicatorsVO  {
 	private static final long serialVersionUID = 1L;
 
-
-	private Integer bonusPoin;
-
+//加分
+	private Integer bonusPoins;
+	//总分
+	private Integer totalPoints;
+//扣分
 	private Integer deductionPoints;
 
 	private List<IndicatorsVO> indicatorsVOS;
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java
index ef4ab210f..c187a1d05 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java
@@ -41,5 +41,5 @@ public interface IndicatorsMapper extends BaseMapper<IndicatorsEntity> {
 	 * @param params
 	 * @return
 	 */
-	BeIndicatorsVO selectMyPoints(Map<String, Object> params);
+	BeIndicatorsVO selectMyPoints(@Param("params")Map<String, Object> params);
 }
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
index 225942573..1a0aac9ef 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
@@ -72,7 +72,7 @@
         GROUP BY si.classify_id
     </select>
     <select id="selectMyPoints" resultType="com.logpm.supervise.vo.api.BeIndicatorsVO">
-        select sum(case  when point < 0 then point else 0 end) as deductionPoints , sum(case  when point > 0 then point else 0 end) as bonusPoin from sup_indicators where assess_dept = #{deptId} and DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+        select 0 As totalPoints， sum(case  when point < 0 then point else 0 end) as deductionPoints , sum(case  when point > 0 then point else 0 end) as bonusPoins from sup_indicators where assess_dept = #{deptId} and DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
     </select>
 
 </mapper>