From 54b55bad59c47e0419d78eac2e6015bfe3f1e5eb Mon Sep 17 00:00:00 2001
From: lijiarao <136157943@qq.com>
Date: Sat, 3 Feb 2024 18:05:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080253=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9=E4=B8=AD=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=E4=B8=AD/=E5=AE=A1=E6=89=B9=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=88=A0=E9=99=A4=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsAssessServiceImpl.java   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
index 42a5f814..95e6bb2d 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
@@ -14,9 +14,11 @@ import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
 import com.jero.modules.projectLibrary.common.AssessCommon;
 import com.jero.modules.projectLibrary.entity.LawsAssess;
 import com.jero.modules.projectLibrary.entity.LawsAssessResults;
+import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
 import com.jero.modules.projectLibrary.mapper.LawsAssessMapper;
 import com.jero.modules.projectLibrary.service.ILawsAssessResultsService;
 import com.jero.modules.projectLibrary.service.ILawsAssessService;
+import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
 import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO;
 import com.jero.modules.projectLibrary.vo.LawsAssessAddVo;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
@@ -62,6 +64,8 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
 	private LawsAssessMapper lawsAssessMapper;
 	@Resource
 	private ILawsAssessResultsService lawsAssessResultsService;
+	@Resource
+	private ILawsEvaluationNotMetService notMetService;
     /**
      * 分页查询
      *
@@ -135,6 +139,23 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
 	@Override
     public void deleteById(String id) {
 		LawsAssess lawsAssess = getById(id);
+		String processStatus = lawsAssess.getProcessStatus();
+		if (AssessCommon.UNDER_EVALUATION.equals(processStatus)){
+			throw new JeroBootException(ResultCommon.ERROR);
+		}
+		//未符合项中有整改中、审批中的数据时，不允许删除
+		LambdaQueryWrapper<LawsEvaluationNotMet> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(LawsEvaluationNotMet::getProjectId, lawsAssess.getProjectId());
+		queryWrapper.in(LawsEvaluationNotMet::getStandardId, lawsAssess.getStandardId());
+		List<LawsEvaluationNotMet> notMetList = notMetService.list(queryWrapper);
+		for (LawsEvaluationNotMet notMet : notMetList) {
+			String state = notMet.getState();
+			if (AssessCommon.RECTIFICATION.equals(state)||
+					AssessCommon.UNDER_APPROVAL.equals(state)){
+				throw new JeroBootException(ResultCommon.ASSESS_DELETE_ERROR);
+			}
+		}
+
 		lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
 		updateById(lawsAssess);
     }