考核指标指标名称字段维护

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;

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>