From a022f2a82b94394e0accd7d78bb95e34c529078a Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 24 Feb 2024 10:14:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=80=83=E6=A0=B8-=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IndicatorsServiceImpl.java   | 49 ++++++++++++++-----
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
index 63a017cd0..f5529df14 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
@@ -12,6 +12,7 @@ import com.logpm.supervise.vo.ExportIndicatorsVO;
 import com.logpm.supervise.vo.IndicatorsVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -68,24 +69,30 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 			Long createUser = record.getCreateUser();
 			Long assessUserId = record.getAssessUserId();
 			Long assessDept = record.getAssessDept();
-			if(userId.equals(createUser)){
-				record.setIsEdit(1);
+			Integer indicatorsStatus = record.getIndicatorsStatus();
+			if(indicatorsStatus.equals(2)){
+				record.setIsEdit(0);
 			}else{
-				if(Objects.isNull(assessUserId)){
-					Long deptId1 = Long.parseLong(AuthUtil.getDeptId());
-					if(deptId1.equals(assessDept)){
-						record.setIsEdit(2);
-					}else{
-						record.setIsEdit(0);
-					}
+				if(userId.equals(createUser)){
+					record.setIsEdit(1);
 				}else{
-					if(assessUserId.equals(userId)){
-						record.setIsEdit(2);
+					if(Objects.isNull(assessUserId)){
+						Long deptId1 = Long.parseLong(AuthUtil.getDeptId());
+						if(deptId1.equals(assessDept)){
+							record.setIsEdit(2);
+						}else{
+							record.setIsEdit(0);
+						}
 					}else{
-						record.setIsEdit(0);
+						if(assessUserId.equals(userId)){
+							record.setIsEdit(2);
+						}else{
+							record.setIsEdit(0);
+						}
 					}
 				}
 			}
+
 		}
 		pages.setRecords(records);
 
@@ -117,6 +124,12 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 			return R.fail(405,"指标信息不存在");
 		}
 
+		Integer indicatorsStatus = indicatorsEntity.getIndicatorsStatus();
+		if(indicatorsStatus.equals(2)){
+			log.warn("############updateIndicators: 考核已确认，不能编辑");
+			return R.fail(405,"考核已确认，不能编辑");
+		}
+
 		indicatorsEntity.setAssessDept(indicatorsDTO.getAssessDept());
 		indicatorsEntity.setAssessDeptName(indicatorsDTO.getAssessDeptName());
 		indicatorsEntity.setAssessUserId(indicatorsDTO.getAssessUserId());
@@ -134,6 +147,18 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 	@Override
 	public void deleteById(Long id) {
 
+		IndicatorsEntity indicatorsEntity = baseMapper.selectById(id);
+		if(Objects.isNull(indicatorsEntity)){
+			log.warn("############deleteById: 未找到考核信息");
+			throw new CustomerException(405,"未找到考核信息");
+		}
+
+		Integer indicatorsStatus = indicatorsEntity.getIndicatorsStatus();
+		if(indicatorsStatus.equals(2)){
+			log.warn("############deleteById: 考核已确认，不能删除");
+			throw new CustomerException(405,"考核已确认，不能删除");
+		}
+
 		baseMapper.deleteById(id);
 
 	}