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 queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsEvaluationNotMet::getProjectId, lawsAssess.getProjectId()); + queryWrapper.in(LawsEvaluationNotMet::getStandardId, lawsAssess.getStandardId()); + List 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); }