From 441a7f9f49120a81f83503fa0d91e4aecc38a135 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 27 Jan 2024 23:12:39 +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/IndicatorsVO.java    |  3 +++
 .../com/logpm/supervise/mapper/IndicatorsMapper.java |  2 +-
 .../com/logpm/supervise/mapper/IndicatorsMapper.xml  | 12 ++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java
index 436e67133..c45889b22 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java
@@ -16,6 +16,9 @@ public class IndicatorsVO extends IndicatorsEntity {
 	private String classifyName;
 
 	private Long parentClassifyId;
+
+	private Integer bonusPoin;
+	private Integer deductionPoints;
 	private String parentClassifyName;
 
 	private List<IndicatorsAnnexEntity> pictures = new ArrayList<>();
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 383071f81..ba373a07e 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
@@ -33,5 +33,5 @@ public interface IndicatorsMapper extends BaseMapper<IndicatorsEntity> {
 	 * @param params
 	 * @return
 	 */
-	Page<IndicatorsVO> selectBeMyApiIndicators(IPage<IndicatorsVO> page, Map<String, Object> params);
+	Page<IndicatorsVO> selectBeMyApiIndicators(IPage<IndicatorsVO> page,@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 e643c43b7..2e4d545e3 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
@@ -62,20 +62,20 @@
         SELECT
         si.*,
         sc.NAME AS classifyName,
-        t.加分,
-        t.扣分
+        t.bonusPoin,
+        t.deductionPoints
         FROM
         sup_indicators AS si
         LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
         LEFT JOIN (SELECT
-        sum( CASE WHEN point &lt; 0 THEN point ELSE 0 END ) AS 扣分,
-        sum( CASE WHEN point &gt; 0 THEN point ELSE 0 END ) AS 加分,
+        sum( CASE WHEN point &lt; 0 THEN point ELSE 0 END ) AS deductionPoints,
+        sum( CASE WHEN point &gt; 0 THEN point ELSE 0 END ) AS bonusPoin,
         id AS id,
         assess_dept AS assess_dept
         FROM
         sup_indicators WHERE
-        assess_dept = #{deptId} AND DATE_FORMAT( create_time,'%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) AS t ON t.id = si.id
-        WHERE si.assess_dept = #{deptId}
+        assess_dept = #{params.deptId} AND DATE_FORMAT( create_time,'%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) AS t ON t.id = si.id
+        WHERE si.assess_dept = #{params.deptId}
         <if test="params.startTime != null and params.startTime != ''" >
             AND date_format(si.create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
         </if>