From e674d133577dddef16209612b4c2cbd59272a8ca Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 27 Jan 2024 19:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E6=8C=87=E6=A0=87=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/supervise/entity/IndicatorsEntity.java     | 3 +--
 .../java/com/logpm/supervise/mapper/IndicatorsMapper.xml | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java
index ece8195a1..71a011d59 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java
@@ -29,8 +29,7 @@ public class IndicatorsEntity  extends TenantEntity {
 	@ApiModelProperty(value = "考核指标")
 	private Long classifyId;
 
-	@ApiModelProperty(value = "考核指标名称")
-	private String classifyName;
+
 
 	@ApiModelProperty(value = "分数")
 	private int point;
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 d966be716..4d7c51763 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
@@ -46,15 +46,16 @@
           and si.id = #{id}
     </select>
     <select id="selectMyApiIndicators" resultType="com.logpm.supervise.vo.IndicatorsVO">
-        SELECT * FROM sup_indicators WHERE is_deleted = 0 and create_user = #{params.userId}
+        SELECT si.*，sc.name AS classifyName FROM sup_indicators AS  si LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
+         WHERE si.is_deleted = 0 and si.create_user = #{params.userId} AND sc.is_deleted = 0
         <if test="params.assessDept != null and params.assessDept != ''" >
-            and assess_dept = #{params.assessDept}
+            and si.assess_dept = #{params.assessDept}
         </if>
         <if test="params.startTime != null and params.startTime != ''" >
-            and date_format(create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
+            and si.date_format(create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
         </if>
         <if test="params.endTime != null and params.endTime != ''" >
-            and date_format(create_time,'%y%m%d%') &lt;= date_format(#{params.endTime},'%y%m%d%')
+            and si.date_format(create_time,'%y%m%d%') &lt;= date_format(#{params.endTime},'%y%m%d%')
         </if>
     </select>