From 52bc344e3b232d29be1129d45717e404110894e8 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 24 Feb 2024 12:18:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=80=83=E6=A0=B8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=86=E6=95=B0=E7=BB=9F=E8=AE=A1=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml  | 2 +-
 .../com/logpm/supervise/service/impl/ClassifyServiceImpl.java  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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 73b58aeb1..f2fb2742e 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
@@ -90,7 +90,7 @@
         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 = #{params.deptId}
+        where assess_dept = #{params.deptId} AND is_deleted = 0
         and DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
         ]]>
     </select>
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
index 24b36879e..d3ecfae87 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
@@ -374,6 +374,9 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	@Override
 	public R myApiIndicatorsDetail(Long id,Long classifyId) {
 		IndicatorsEntity indicatorsEntity = iIndicatorsService.getById(id);
+		if (2 == indicatorsEntity.getIndicatorsStatus()){
+			return R.fail("已确认考核无法进行修改");
+		}
 		//查询是否存在有附件
 		List<IndicatorsAnnexEntity> list = indicatorsAnnexService.list(Wrappers.<IndicatorsAnnexEntity>query().lambda().eq(IndicatorsAnnexEntity::getIndicatorsId, id));
 		IndicatorsVO indicatorsVO = IndicatorsWrapper.build().entityVO(indicatorsEntity);